aboutsummaryrefslogtreecommitdiff
path: root/devel
diff options
context:
space:
mode:
Diffstat (limited to 'devel')
-rw-r--r--devel/Makefile5
-rw-r--r--devel/fpc-bfd/Makefile1
-rw-r--r--devel/fpc-bfd/pkg-plist5
-rw-r--r--devel/fpc-dbus/Makefile1
-rw-r--r--devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp11
-rw-r--r--devel/fpc-dbus/pkg-plist5
-rw-r--r--devel/fpc-fcl-async/Makefile3
-rw-r--r--devel/fpc-fcl-async/pkg-plist8
-rw-r--r--devel/fpc-fcl-base/Makefile5
-rw-r--r--devel/fpc-fcl-base/pkg-plist57
-rw-r--r--devel/fpc-fcl-db/Makefile11
-rw-r--r--devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile28
-rw-r--r--devel/fpc-fcl-db/pkg-plist128
-rw-r--r--devel/fpc-fcl-extra/Makefile5
-rw-r--r--devel/fpc-fcl-extra/pkg-plist4
-rw-r--r--devel/fpc-fcl-fpcunit/Makefile5
-rw-r--r--devel/fpc-fcl-fpcunit/pkg-plist48
-rw-r--r--devel/fpc-fcl-image/Makefile5
-rw-r--r--devel/fpc-fcl-image/pkg-plist179
-rw-r--r--devel/fpc-fcl-js/Makefile3
-rw-r--r--devel/fpc-fcl-js/pkg-plist13
-rw-r--r--devel/fpc-fcl-json/Makefile5
-rw-r--r--devel/fpc-fcl-json/pkg-plist24
-rw-r--r--devel/fpc-fcl-net/Makefile6
-rw-r--r--devel/fpc-fcl-net/pkg-plist13
-rw-r--r--devel/fpc-fcl-passrc/Makefile5
-rw-r--r--devel/fpc-fcl-passrc/pkg-plist30
-rw-r--r--devel/fpc-fcl-process/pkg-plist19
-rw-r--r--devel/fpc-fcl-registry/Makefile5
-rw-r--r--devel/fpc-fcl-registry/pkg-plist9
-rw-r--r--devel/fpc-fcl-res/Makefile5
-rw-r--r--devel/fpc-fcl-res/pkg-plist47
-rw-r--r--devel/fpc-fcl-sdo/Makefile16
-rw-r--r--devel/fpc-fcl-sdo/pkg-plist77
-rw-r--r--devel/fpc-fcl-sound/Makefile (renamed from devel/fpc-fpmkunit/Makefile)9
-rw-r--r--devel/fpc-fcl-sound/pkg-plist7
-rw-r--r--devel/fpc-fcl-stl/Makefile (renamed from devel/fpc-fcl-process/Makefile)6
-rw-r--r--devel/fpc-fcl-stl/pkg-plist25
-rw-r--r--devel/fpc-fcl-web/Makefile11
-rw-r--r--devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile49
-rw-r--r--devel/fpc-fcl-web/pkg-plist98
-rw-r--r--devel/fpc-fcl-xml/Makefile5
-rw-r--r--devel/fpc-fcl-xml/pkg-plist30
-rw-r--r--devel/fpc-fpmkunit/pkg-plist4
-rw-r--r--devel/fpc-fppkg/Makefile7
-rw-r--r--devel/fpc-fppkg/pkg-plist19
-rw-r--r--devel/fpc-fv/Makefile3
-rw-r--r--devel/fpc-fv/pkg-plist83
-rw-r--r--devel/fpc-gdbint/Makefile1
-rw-r--r--devel/fpc-gdbint/pkg-plist7
-rw-r--r--devel/fpc-newt/Makefile1
-rw-r--r--devel/fpc-newt/files/patch-packages_newt_fpmake.pp11
-rw-r--r--devel/fpc-newt/pkg-plist5
-rw-r--r--devel/fpc-pthreads/Makefile1
-rw-r--r--devel/fpc-pthreads/pkg-plist5
-rw-r--r--devel/fpc-regexpr/Makefile3
-rw-r--r--devel/fpc-regexpr/pkg-plist12
-rw-r--r--devel/fpc-sdl/Makefile1
-rw-r--r--devel/fpc-sdl/pkg-plist38
-rw-r--r--devel/fpc-symbolic/Makefile1
-rw-r--r--devel/fpc-symbolic/pkg-plist8
-rw-r--r--devel/fpc-zlib/Makefile1
-rw-r--r--devel/fpc-zlib/pkg-plist5
63 files changed, 520 insertions, 727 deletions
diff --git a/devel/Makefile b/devel/Makefile
index 6aa2b8a18e91..d39d2108530e 100644
--- a/devel/Makefile
+++ b/devel/Makefile
@@ -544,12 +544,13 @@
SUBDIR += fpc-fcl-json
SUBDIR += fpc-fcl-net
SUBDIR += fpc-fcl-passrc
- SUBDIR += fpc-fcl-process
SUBDIR += fpc-fcl-registry
SUBDIR += fpc-fcl-res
+ SUBDIR += fpc-fcl-sdo
+ SUBDIR += fpc-fcl-sound
+ SUBDIR += fpc-fcl-stl
SUBDIR += fpc-fcl-web
SUBDIR += fpc-fcl-xml
- SUBDIR += fpc-fpmkunit
SUBDIR += fpc-fppkg
SUBDIR += fpc-fv
SUBDIR += fpc-gdbint
diff --git a/devel/fpc-bfd/Makefile b/devel/fpc-bfd/Makefile
index 65e566f20e68..aeadfd13cf9b 100644
--- a/devel/fpc-bfd/Makefile
+++ b/devel/fpc-bfd/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -bfd
diff --git a/devel/fpc-bfd/pkg-plist b/devel/fpc-bfd/pkg-plist
index b9c8e62f5a71..b1c9e1adf7a5 100644
--- a/devel/fpc-bfd/pkg-plist
+++ b/devel/fpc-bfd/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/bfd.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/libpbfd.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/bfd/bfd.ppu
diff --git a/devel/fpc-dbus/Makefile b/devel/fpc-dbus/Makefile
index 95eeab3cd372..ecc240e106c7 100644
--- a/devel/fpc-dbus/Makefile
+++ b/devel/fpc-dbus/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -dbus
diff --git a/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp b/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp
new file mode 100644
index 000000000000..b628f710dd2f
--- /dev/null
+++ b/devel/fpc-dbus/files/patch-packages_dbus_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/dbus/fpmake.pp.orig 2015-01-05 19:27:06 UTC
++++ packages/dbus/fpmake.pp
+@@ -24,7 +24,7 @@ begin
+ P.Email := '';
+ P.Description := 'D-Bus message bus interface. (1.2.16)';
+ P.NeedLibC:= true;
+- P.OSes := [linux];
++ P.OSes := [linux,dragonfly,freebsd];
+
+ P.SourcePath.Add('src');
+ P.IncludePath.Add('src');
diff --git a/devel/fpc-dbus/pkg-plist b/devel/fpc-dbus/pkg-plist
index 57d2d1002f50..9f9889f00856 100644
--- a/devel/fpc-dbus/pkg-plist
+++ b/devel/fpc-dbus/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dbus.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/libpdbus.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dbus/dbus.ppu
diff --git a/devel/fpc-fcl-async/Makefile b/devel/fpc-fcl-async/Makefile
index 4946e4a92048..439d77612a65 100644
--- a/devel/fpc-fcl-async/Makefile
+++ b/devel/fpc-fcl-async/Makefile
@@ -1,12 +1,11 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-async
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal interface to async library
+COMMENT= Free Pascal asynchronous event management (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-async/pkg-plist b/devel/fpc-fcl-async/pkg-plist
index a31664266524..f81a10661d15 100644
--- a/devel/fpc-fcl-async/pkg-plist
+++ b/devel/fpc-fcl-async/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-async.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/fpasync.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libpfpasync.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libplibasync.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-async/libasync.ppu
diff --git a/devel/fpc-fcl-base/Makefile b/devel/fpc-fcl-base/Makefile
index fef05567a0db..cbe4f8abb652 100644
--- a/devel/fpc-fcl-base/Makefile
+++ b/devel/fpc-fcl-base/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-base
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Component Library base
-USE_FPC= hash paszlib pthreads
+USE_FPC= fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-base/pkg-plist b/devel/fpc-fcl-base/pkg-plist
index ca9d7fbec8d1..51dbe4cf8637 100644
--- a/devel/fpc-fcl-base/pkg-plist
+++ b/devel/fpc-fcl-base/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-base.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/ascii85.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/avl_tree.o
@@ -7,22 +7,39 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/base64.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/blowfish.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/bufstream.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/cachecls.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/contnrs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvdocument.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvdocument.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvreadwrite.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/csvreadwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/custapp.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/eventlog.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fileinfo.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpexprpars.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpmimetypes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fpobserver.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptemplate.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/fptimer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/gettext.o
@@ -31,46 +48,14 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/idea.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inicol.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/inifiles.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/iostream.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpascii85.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpavl_tree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbase64.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpblowfish.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpbufstream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcachecls.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcontnrs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpcustapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpeventlog.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpexprpars.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfpmimetypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptemplate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpfptimer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpgettext.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpidea.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinicol.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpinifiles.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpiostream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libplibtar.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpmaskutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpnullstream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libppooledmm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprtfpars.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libprttiutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpstreamio.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpsyncobjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpuriparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwformat.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libpwtex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/libtar.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/maskutils.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/nullstream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/pooledmm.o
@@ -81,10 +66,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/rttiutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamcoll.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamex.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/streamio.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/syncobjs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-base/uriparser.o
diff --git a/devel/fpc-fcl-db/Makefile b/devel/fpc-fcl-db/Makefile
index c46ac92d35bf..87a54d9430e3 100644
--- a/devel/fpc-fcl-db/Makefile
+++ b/devel/fpc-fcl-db/Makefile
@@ -1,22 +1,17 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-db
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Database Library (FCL)
-USE_FPC= dblib fcl-async fcl-base fcl-json fcl-xml hash ibase mysql odbc oracle paszlib postgres \
- pthreads pxlib sqlite
+USE_FPC= fcl-base fcl-xml rtl-objpas rtl-extra ibase mysql odbc \
+ oracle postgres sqlite dblib pxlib fcl-json
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fu../base/units/* -Fu../../base/units/* -Fu../dbase -Fu../../dbase -Fu../ \
- -Fu../sqldb -Fu../sqldb/interbase -Fu../sqldb/mysql -Fu../sqldb/odbc \
- -Fu../sqldb/postgres -Fu../sqldb/oracle -Fu../sqldb/sqlite \
- -Fu../datadict -Ur -CX
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile b/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
deleted file mode 100644
index ddfd7f2ab5df..000000000000
--- a/devel/fpc-fcl-db/files/patch-packages-fcl-db_Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
---- packages/fcl-db/Makefile 2009-01-07 21:56:28.000000000 -0500
-+++ packages/fcl-db/Makefile 2009-01-07 22:18:51.000000000 -0500
-@@ -2203,17 +2203,17 @@
- endif
- $(INSTALLEXE) $(INSTALLEXEFILES) $(INSTALL_BINDIR)
- endif
--ifdef INSTALL_CREATEPACKAGEFPC
--ifdef FPCMAKE
--ifdef PACKAGE_VERSION
--ifneq ($(wildcard Makefile.fpc),)
-+#ifdef INSTALL_CREATEPACKAGEFPC
-+#ifdef FPCMAKE
-+#ifdef PACKAGE_VERSION
-+#ifneq ($(wildcard Makefile.fpc),)
- $(FPCMAKE) -p -T$(CPU_TARGET)-$(OS_TARGET) Makefile.fpc
- $(MKDIR) $(INSTALL_UNITDIR)
- $(INSTALL) Package.fpc $(INSTALL_UNITDIR)
--endif
--endif
--endif
--endif
-+#endif
-+#endif
-+#endif
-+#endif
- ifdef INSTALLPPUFILES
- $(MKDIR) $(INSTALL_UNITDIR)
- $(INSTALL) $(INSTALLPPUFILES) $(INSTALL_UNITDIR)
diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index da15b4f90e50..9091db1f7894 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -1,16 +1,20 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-db.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/csvdataset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/csvdataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
@@ -49,6 +53,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbadmin.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbeventmonitor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fbeventmonitor.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o
@@ -57,22 +62,29 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o
@@ -91,152 +103,88 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpjsondataset.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpjsondataset.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlscanner.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqltree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpxmlxsdexport.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_collate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_common.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_cursor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_dbffile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_fields.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_idxcur.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_idxfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_lang.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_memo.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_pgfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prscore.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prsdef.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_prssupp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_str.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbf_wtil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfbadmin.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfbeventmonitor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgcreatedbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgdbcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgsqlconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcgtiopf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpcsvexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddbf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddfb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql41.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql50.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql51.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddmysql55.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddodbc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddoracle.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpopcode.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqldb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpfixedexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpjsondataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqltree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpxmlxsdexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpibconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmssqlconn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql40conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql41conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql50conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql51conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql56conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql55conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqeventmonitor.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldblib.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3backup.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpxmldatapacketreader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mssqlconn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mssqlconn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql51conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql55conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql56conn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql57conn.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqeventmonitor.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqeventmonitor.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o
@@ -255,5 +203,7 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.rsj
diff --git a/devel/fpc-fcl-extra/Makefile b/devel/fpc-fcl-extra/Makefile
index 5fc3eb87ba6e..3d071c36942d 100644
--- a/devel/fpc-fcl-extra/Makefile
+++ b/devel/fpc-fcl-extra/Makefile
@@ -1,13 +1,12 @@
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-extra
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal extra libraries (FCL)
-USE_FPC= fcl-base
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-extra/pkg-plist b/devel/fpc-fcl-extra/pkg-plist
index 5bd4cfc94cec..ec0446695008 100644
--- a/devel/fpc-fcl-extra/pkg-plist
+++ b/devel/fpc-fcl-extra/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-extra.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/libpdaemonapp.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-extra/daemonapp.rsj
diff --git a/devel/fpc-fcl-fpcunit/Makefile b/devel/fpc-fcl-fpcunit/Makefile
index edd5a2212206..0b1c051e960a 100644
--- a/devel/fpc-fcl-fpcunit/Makefile
+++ b/devel/fpc-fcl-fpcunit/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-fpcunit
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal unit testing library (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads
+USE_FPC= fcl-base fcl-xml
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-fpcunit/pkg-plist b/devel/fpc-fcl-fpcunit/pkg-plist
index 4b998bf9f2fd..95c85c51a2cf 100644
--- a/devel/fpc-fcl-fpcunit/pkg-plist
+++ b/devel/fpc-fcl-fpcunit/pkg-plist
@@ -1,40 +1,28 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-fpcunit.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/consoletestrunner.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/digesttestreport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testregistry.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testdecorator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testreport.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/ubmockobject.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunitreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/latextestreport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmlreporter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/plaintestreport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/fpcunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/testutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpconsoletestrunner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpdigesttestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestregistry.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestdecorator.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpubmockobject.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpxmlreporter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpfpcunitreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libplatextestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpxmltestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpplaintestreport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libpfpcunit.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/libptestutils.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-fpcunit/xmltestreport.ppu
diff --git a/devel/fpc-fcl-image/Makefile b/devel/fpc-fcl-image/Makefile
index bf3e43e6c341..d92c374d6d03 100644
--- a/devel/fpc-fcl-image/Makefile
+++ b/devel/fpc-fcl-image/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 3
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-image
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal image loading and conversion libraries (FCL)
-USE_FPC= fcl-async fcl-base hash pasjpeg paszlib pthreads libpng
+USE_FPC= fcl-base fcl-res pasjpeg rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-image/pkg-plist b/devel/fpc-fcl-image/pkg-plist
index 88dd58878497..5cf14aaa4da1 100644
--- a/devel/fpc-fcl-image/pkg-plist
+++ b/devel/fpc-fcl-image/pkg-plist
@@ -1,127 +1,86 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritebmp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-image.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritejpeg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimage.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimggauss.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadgif.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpng.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpsd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/clipping.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcanvas.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fppixlcanv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpimgcanv.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxpm.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadxwd.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritebmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadbmp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/bmpcomn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpnm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadjpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritebmp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritejpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadpcx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritejpeg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fptiffcmn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtiff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpreadtga.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepcx.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepng.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritepnm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ellipses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpcolhash.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpditherer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpquantizer.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/extinterpolation.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetga.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritetiff.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/fpwritexpm.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetype.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/freetypeh.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/ftfont.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pcxcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pixtools.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pngcomn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/pscanvas.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/targacmn.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimgcmn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimage.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimggauss.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppngcomn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadgif.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpng.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpsd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxwd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepng.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadxpm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritexpm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpclipping.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpcanvas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppixtools.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfppixlcanv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpimgcanv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppscanvas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritebmp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadbmp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpbmpcomn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpnm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepnm.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadjpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritejpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libppcxcomn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadpcx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritepcx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfptiffcmn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadtiff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritetiff.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libptargacmn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpreadtga.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpwritetga.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpellipses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpcolhash.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetypeh.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpditherer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfpquantizer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpextinterpolation.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpfreetype.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpftfont.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/libpxwdfile.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-image/xwdfile.ppu
diff --git a/devel/fpc-fcl-js/Makefile b/devel/fpc-fcl-js/Makefile
index 6eb9b7470529..4ddf8582ed7d 100644
--- a/devel/fpc-fcl-js/Makefile
+++ b/devel/fpc-fcl-js/Makefile
@@ -1,12 +1,11 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-js
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal Javascript scanner/parser/syntax tree (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-js/pkg-plist b/devel/fpc-fcl-js/pkg-plist
index 7ffc8ddbe3ba..65b76bc7857e 100644
--- a/devel/fpc-fcl-js/pkg-plist
+++ b/devel/fpc-fcl-js/pkg-plist
@@ -1,13 +1,16 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-js.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsbase.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsbase.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsparser.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jsscanner.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstoken.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jstree.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsbase.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjsscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/libpjstree.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-js/jswriter.rsj
diff --git a/devel/fpc-fcl-json/Makefile b/devel/fpc-fcl-json/Makefile
index c31f88244b9a..44585da6519f 100644
--- a/devel/fpc-fcl-json/Makefile
+++ b/devel/fpc-fcl-json/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-json
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= JSON (JavaScript Object Notation) implementation in FreePascal
+COMMENT= Free Pascal JavaScript Object Notation implemenation (FCL)
-USE_FPC= fcl-base
+USE_FPC= fcl-base rtl-objpas fcl-res
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-json/pkg-plist b/devel/fpc-fcl-json/pkg-plist
index 24fc9ea1ed72..b4103115c007 100644
--- a/devel/fpc-fcl-json/pkg-plist
+++ b/devel/fpc-fcl-json/pkg-plist
@@ -1,16 +1,16 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-json.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjsonrtti.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonconf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjson.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpfpjsonrtti.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/libpjsonconf.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonparser.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/jsonscanner.rsj
diff --git a/devel/fpc-fcl-net/Makefile b/devel/fpc-fcl-net/Makefile
index 06ca0ca72724..d3d74239d75f 100644
--- a/devel/fpc-fcl-net/Makefile
+++ b/devel/fpc-fcl-net/Makefile
@@ -1,18 +1,16 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-net
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal network interfaces (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml fcl-passrc hash paszlib pthreads
+USE_FPC= fcl-base openssl fcl-xml fcl-passrc fcl-async rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fu${WRKDIR}/${WRKUNITDIR}/*
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-net/pkg-plist b/devel/fpc-fcl-net/pkg-plist
index 486fe754963e..4462b3474610 100644
--- a/devel/fpc-fcl-net/pkg-plist
+++ b/devel/fpc-fcl-net/pkg-plist
@@ -1,16 +1,17 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-net.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/cnetdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpcnetdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpfpsock.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpnetdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpresolve.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/libpssockets.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/fpsock.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/netdb.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/resolve.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/sslsockets.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-net/ssockets.rsj
diff --git a/devel/fpc-fcl-passrc/Makefile b/devel/fpc-fcl-passrc/Makefile
index 67b3676b65bf..c942c0c7354b 100644
--- a/devel/fpc-fcl-passrc/Makefile
+++ b/devel/fpc-fcl-passrc/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-passrc
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal language parsing library (FPC)
-USE_FPC= yes
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-passrc/pkg-plist b/devel/fpc-fcl-passrc/pkg-plist
index 0bb8b4d45046..7c0f1cbb226a 100644
--- a/devel/fpc-fcl-passrc/pkg-plist
+++ b/devel/fpc-fcl-passrc/pkg-plist
@@ -1,19 +1,17 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-passrc.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/passrcutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastounittest.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pastree.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppastree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppscanner.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppparser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppassrcutil.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppastounittest.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/libppaswrite.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/paswrite.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pparser.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-passrc/pscanner.rsj
diff --git a/devel/fpc-fcl-process/pkg-plist b/devel/fpc-fcl-process/pkg-plist
deleted file mode 100644
index a7c2d94474ba..000000000000
--- a/devel/fpc-fcl-process/pkg-plist
+++ /dev/null
@@ -1,19 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugintf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/dbugmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugintf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpdbugmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libppipes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libppipesipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpprocess.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/libpsimpleipc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/pipesipc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/process.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-process/simpleipc.ppu
diff --git a/devel/fpc-fcl-registry/Makefile b/devel/fpc-fcl-registry/Makefile
index 7ac69078cd18..ee3fba8ce23a 100644
--- a/devel/fpc-fcl-registry/Makefile
+++ b/devel/fpc-fcl-registry/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-registry
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal emulation of Windows registry (FCL)
-USE_FPC= fcl-async fcl-base fcl-xml hash paszlib pthreads
+USE_FPC= fcl-base fcl-xml
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-registry/pkg-plist b/devel/fpc-fcl-registry/pkg-plist
index 6964a567494c..95b072e57fe5 100644
--- a/devel/fpc-fcl-registry/pkg-plist
+++ b/devel/fpc-fcl-registry/pkg-plist
@@ -1,7 +1,6 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-registry.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/registry.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/libpxmlreg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/libpregistry.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-registry/xmlreg.ppu
diff --git a/devel/fpc-fcl-res/Makefile b/devel/fpc-fcl-res/Makefile
index 4e726f62be3e..5349b52ec89e 100644
--- a/devel/fpc-fcl-res/Makefile
+++ b/devel/fpc-fcl-res/Makefile
@@ -1,14 +1,13 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-res
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal resource handlers (FCL)
-USE_FPC= fcl-base
+USE_FPC= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-res/pkg-plist b/devel/fpc-fcl-res/pkg-plist
index 544a24b02b31..7712dd0959cd 100644
--- a/devel/fpc-fcl-res/pkg-plist
+++ b/devel/fpc-fcl-res/pkg-plist
@@ -1,9 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-res.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/acceleratorsresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/acceleratorsresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/bitmapresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/bitmapresource.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/coffreader.ppu
@@ -37,43 +36,6 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/groupresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/groupresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/icocurtypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/icocurtypes.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpacceleratorsresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpbitmapresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcofftypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpcoffwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpdfmreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelftypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpelfwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternalreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternaltypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpexternalwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpfpcrestypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupcursorresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupiconresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpgroupresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpicocurtypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachoconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachoreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachotypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpmachowriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresdatastream.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresfactory.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresmerger.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresourcetree.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpresreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpreswriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstringtableresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpstrtable.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libptlbreader.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversionresource.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpversiontypes.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/libpwinpeimagereader.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/machoreader.o
@@ -86,10 +48,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resdatastream.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resfactory.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resmerger.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resmerger.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resource.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resourcetree.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resourcetree.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/resreader.o
@@ -98,15 +62,18 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/reswriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/reswriter.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/stringtableresource.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/strtable.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/tlbreader.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionconsts.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionresource.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versionresource.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/versiontypes.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/winpeimagereader.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/winpeimagereader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/xcoffwriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-res/xcoffwriter.ppu
diff --git a/devel/fpc-fcl-sdo/Makefile b/devel/fpc-fcl-sdo/Makefile
new file mode 100644
index 000000000000..844c01574835
--- /dev/null
+++ b/devel/fpc-fcl-sdo/Makefile
@@ -0,0 +1,16 @@
+# $FreeBSD$
+
+CATEGORIES= devel lang
+PKGNAMESUFFIX= -fcl-sdo
+
+MAINTAINER= freebsd-fpc@FreeBSD.org
+COMMENT= Free Pascal Service Data Objects implementation (FCL)
+
+USE_FPC= dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \
+ oracle postgres pxlib rtl-extra sqlite
+
+MASTERDIR= ${.CURDIR}/../../lang/fpc
+WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
+EXTRACTUNITDIR= ${WRKUNITDIR}
+
+.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-sdo/pkg-plist b/devel/fpc-fcl-sdo/pkg-plist
new file mode 100644
index 000000000000..41f6d4a06f0c
--- /dev/null
+++ b/devel/fpc-fcl-sdo/pkg-plist
@@ -0,0 +1,77 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-sdo.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/data_acces_intf.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/pas_generator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/pas_generator.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_binary_streamer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_binary_streamer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_changesummary.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_changesummary.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_consts.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_cursor_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_cursor_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_imp.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_das_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_datafactory.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_datafactory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dataobject.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dataobject.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_date_utils.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dom_cursors.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_dom_cursors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_field_imp.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_field_imp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_fpc_xml.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_imp_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_imp_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_linked_list.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_linked_list.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_locators.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_locators.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_logger_intf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_logger_intf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_parserutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_parserutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_rtti_filters.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_rtti_filters.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_binary.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_binary.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_serialization_xml.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_type.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_type.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_types.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_types.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_utils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_utils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xpath_helper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xpath_helper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsd_helper.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsd_helper.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdintf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdintf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/sdo_xsdparser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_consts.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_consts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_generator.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sdo/xsd_generator.ppu
diff --git a/devel/fpc-fpmkunit/Makefile b/devel/fpc-fcl-sound/Makefile
index 8589048e2513..5dfc8d7b8cd1 100644
--- a/devel/fpc-fpmkunit/Makefile
+++ b/devel/fpc-fcl-sound/Makefile
@@ -1,15 +1,12 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
-PKGNAMESUFFIX= -fpmkunit
+PKGNAMESUFFIX= -fcl-sound
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal build system unit
+COMMENT= Free Pascal sound loading, storing and converion (FCL)
-USE_FPC= fcl-process hash paszlib
-USE_FPC_RUN= yes
+USE_FPC= fcl-base fcl-res rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fcl-sound/pkg-plist b/devel/fpc-fcl-sound/pkg-plist
new file mode 100644
index 000000000000..ee7417ceb675
--- /dev/null
+++ b/devel/fpc-fcl-sound/pkg-plist
@@ -0,0 +1,7 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-sound.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavformat.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavformat.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavreader.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavwriter.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-sound/fpwavwriter.ppu
diff --git a/devel/fpc-fcl-process/Makefile b/devel/fpc-fcl-stl/Makefile
index f3129b846fdf..7307e001db70 100644
--- a/devel/fpc-fcl-process/Makefile
+++ b/devel/fpc-fcl-stl/Makefile
@@ -1,12 +1,10 @@
-# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
-PKGNAMESUFFIX= -fcl-process
+PKGNAMESUFFIX= -fcl-stl
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal unit to start and manipulate other programs
+COMMENT= Free Pascal generic container library (FCL)
USE_FPC= yes
diff --git a/devel/fpc-fcl-stl/pkg-plist b/devel/fpc-fcl-stl/pkg-plist
new file mode 100644
index 000000000000..e6eecc122a8e
--- /dev/null
+++ b/devel/fpc-fcl-stl/pkg-plist
@@ -0,0 +1,25 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-stl.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/garrayutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gdeque.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashmap.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/ghashset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gmap.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gpriorityqueue.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gqueue.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gset.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gstack.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gtree.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gutil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-stl/gvector.ppu
diff --git a/devel/fpc-fcl-web/Makefile b/devel/fpc-fcl-web/Makefile
index b4db570ce837..318fa57cee6f 100644
--- a/devel/fpc-fcl-web/Makefile
+++ b/devel/fpc-fcl-web/Makefile
@@ -1,21 +1,18 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-web
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal web application libary (FCL)
-USE_FPC= fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net fcl-process \
- fcl-xml hash httpd22 httpd24 ibase mysql odbc oracle paszlib postgres \
- pthreads sqlite fpmkunit
+USE_FPC= dblib fcl-async fcl-base fcl-db fcl-xml fcl-json fcl-net \
+ fcl-passrc fastcgi httpd22 httpd24 ibase mysql odbc openssl \
+ oracle postgres pxlib rtl-extra sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
EXTRACTUNITDIR= ${WRKUNITDIR}
-OPT= -Fuunits/${BUILDNAME} -Fu../units/${BUILDNAME} -Fu../* \
- -Fu../../units/${BUILDNAME} -Fu../../../units/${BUILDNAME}
.include "${MASTERDIR}/Makefile"
diff --git a/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile b/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile
deleted file mode 100644
index 653f1110c5fa..000000000000
--- a/devel/fpc-fcl-web/files/patch-packages-fcl-web_Makefile
+++ /dev/null
@@ -1,49 +0,0 @@
---- packages/fcl-web/Makefile 2012-02-24 02:00:09.000000000 -0500
-+++ packages/fcl-web/Makefile 2012-02-24 02:01:31.000000000 -0500
-@@ -2057,36 +2057,36 @@
- endif
- .NOTPARALLEL:
- fpmake: fpmake.pp
-- $(FPCFPMAKE) fpmake.pp $(FPMAKE_SKIP_CONFIG) $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
-+ $(FPCFPMAKE) fpmake.pp $(addprefix -Fu,$(COMPILER_FPMAKE_UNITDIR))
- all: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -CX
- smart: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -XX -o -CX
- release: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dRELEASE
- debug: fpmake
-- $(LOCALFPMAKE) compile --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
-+ $(LOCALFPMAKE) compile $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) -o -dDEBUG
- ifeq ($(FPMAKE_BIN_CLEAN),)
- clean:
- else
- clean:
-- $(FPMAKE_BIN_CLEAN) clean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(FPMAKE_BIN_CLEAN) clean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
- endif
- ifeq ($(FPMAKE_BIN_CLEAN),)
- distclean: $(addsuffix _distclean,$(TARGET_DIRS)) fpc_distclean
- else
- distclean:
- ifdef inUnix
-- { $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
-+ { $(FPMAKE_BIN_CLEAN) distclean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC); if [ $$? != "0" ]; then { echo Something wrong with fpmake exectable. Remove the executable and call make recursively to recover.; $(DEL) $(FPMAKE_BIN_CLEAN); $(MAKE) fpc_cleanall; }; fi; }
- else
-- $(FPMAKE_BIN_CLEAN) distclean --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
-+ $(FPMAKE_BIN_CLEAN) distclean $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC)
- endif
- -$(DEL) $(LOCALFPMAKE)
- endif
- install: fpmake
- ifdef UNIXHier
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_PREFIX) --baseinstalldir=$(INSTALL_LIBDIR)/fpc/$(FPC_VERSION) --unitinstalldir=$(INSTALL_UNITDIR)
- else
-- $(LOCALFPMAKE) install --localunitdir=../.. --globalunitdir=.. $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
-+ $(LOCALFPMAKE) install $(FPC_TARGETOPT) $(addprefix -o ,$(FPCOPT)) --compiler=$(FPC) --prefix=$(INSTALL_BASEDIR) --unitinstalldir=$(INSTALL_UNITDIR)
- endif
- distinstall: install
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index 655071dfb8cd..6473efa52577 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -1,114 +1,102 @@
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-web.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiprotocol.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiprotocol.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custhttpapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsjson.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fcgigate.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpapache24.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdispextdirect.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdispextdirect.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextdirect.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpapp.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpapp.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpclient.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpserver.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttpwebclient.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.rst
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpunits.cfg
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjwt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpoauth2ini.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebclient.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebclient.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebdata.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpwebfile.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpprotocol.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.rst
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustfcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcusthttpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcustweb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsjson.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpextjsxml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfcgigate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache24.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpdatasetform.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextdirect.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpextjs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpfcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpclient.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttpserver.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpjsonrpc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpweb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpwebdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpwebfile.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpiniwebsession.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpsqldbwebdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebjsonrpc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebpage.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebsession.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpwebutil.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/iniwebsession.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restbase.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/restcodegen.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rst
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/sqldbwebdata.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.o
diff --git a/devel/fpc-fcl-xml/Makefile b/devel/fpc-fcl-xml/Makefile
index 85232a8d8955..071948866e3b 100644
--- a/devel/fpc-fcl-xml/Makefile
+++ b/devel/fpc-fcl-xml/Makefile
@@ -1,14 +1,13 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 2
CATEGORIES= devel lang
PKGNAMESUFFIX= -fcl-xml
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal Component Library
+COMMENT= Free Pascal XML and DOM library (FCL)
-USE_FPC= fcl-async fcl-base hash iconvenc paszlib pthreads
+USE_FPC= fcl-base fcl-res rtl-objpas iconvenc
USE_FPC_RUN= yes
MASTERDIR= ${.CURDIR}/../../lang/fpc
diff --git a/devel/fpc-fcl-xml/pkg-plist b/devel/fpc-fcl-xml/pkg-plist
index b67df4d98cc7..fedee98bda51 100644
--- a/devel/fpc-fcl-xml/pkg-plist
+++ b/devel/fpc-fcl-xml/pkg-plist
@@ -1,4 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fcl-xml.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/dom_html.o
@@ -11,29 +11,12 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlelements.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmlwriter.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/htmwrite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdom_html.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpdtdmodel.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmldefs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlelements.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmlwriter.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libphtmwrite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_html.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpsax_xml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlcfg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlconf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmliconv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlread.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlstreaming.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlutils.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxmlwrite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/libpxpath.a
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_html.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/sax_xml.o
@@ -42,17 +25,24 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xhtml.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlcfg.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlconf.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmliconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlread.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlstreaming.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmltextreader.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmltextreader.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xmlwrite.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-xml/xpath.rsj
diff --git a/devel/fpc-fpmkunit/pkg-plist b/devel/fpc-fpmkunit/pkg-plist
deleted file mode 100644
index cbd16225892d..000000000000
--- a/devel/fpc-fpmkunit/pkg-plist
+++ /dev/null
@@ -1,4 +0,0 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/fpmkunit.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpmkunit/libpfpmkunit.a
diff --git a/devel/fpc-fppkg/Makefile b/devel/fpc-fppkg/Makefile
index 0a45d26f0d33..fc83645434e7 100644
--- a/devel/fpc-fppkg/Makefile
+++ b/devel/fpc-fppkg/Makefile
@@ -1,14 +1,15 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fppkg
MAINTAINER= freebsd-fpc@FreeBSD.org
-COMMENT= Free Pascal package unit
+COMMENT= Free Pascal package manager unit
-USE_FPC= fcl-base fcl-net fcl-passrc fcl-process fcl-web fcl-xml fpmkunit
+USE_FPC= dblib fastcgi fcl-async fcl-base fcl-db fcl-json fcl-net \
+ fcl-passrc fcl-web fcl-xml httpd22 httpd24 ibase mysql odbc \
+ openssl oracle postgres pxlib rtl-extra sqlite
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fppkg/pkg-plist b/devel/fpc-fppkg/pkg-plist
index 92dc0cad59ed..6ba236181ab1 100644
--- a/devel/fpc-fppkg/pkg-plist
+++ b/devel/fpc-fppkg/pkg-plist
@@ -1,21 +1,10 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fppkg.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fprepos.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfprepos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libpfpxmlrep.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgcommands.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgdownload.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfphttp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgfpmake.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgglobals.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkghandler.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmessages.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgmkconv.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgoptions.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgrepos.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/libppkgwget.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/fpxmlrep.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgcommands.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgdownload.o
@@ -30,11 +19,13 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkghandler.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmessages.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgmkconv.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgoptions.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgrepos.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fppkg/pkgwget.ppu
diff --git a/devel/fpc-fv/Makefile b/devel/fpc-fv/Makefile
index ad1640bff473..20cf9c109a09 100644
--- a/devel/fpc-fv/Makefile
+++ b/devel/fpc-fv/Makefile
@@ -1,14 +1,13 @@
# Created by: John Merryweather Cooper
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -fv
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= FreeVision is a Free Pascal unit for Delphi support
-USE_FPC= yes
+USE_FPC= rtl-console rtl-extra
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-fv/pkg-plist b/devel/fpc-fv/pkg-plist
index b62ae447c513..0afd2f418efa 100644
--- a/devel/fpc-fv/pkg-plist
+++ b/devel/fpc-fv/pkg-plist
@@ -1,74 +1,51 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fv.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/app.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/colortxt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/dialogs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/drivers.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/editors.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvcommon.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/fvconsts.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/gadgets.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/histlist.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/inplong.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/memory.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/menus.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/msgbox.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/outline.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/statuses.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/stddlg.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/tabs.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/time.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/validate.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/sysmsg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/asciitab.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/timeddlg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpcolortxt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdialogs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpdrivers.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpeditors.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvcommon.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpfvconsts.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpgadgets.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libphistlist.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpinplong.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmemory.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmenus.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpmsgbox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpoutline.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstatuses.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpstddlg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptabs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptime.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpvalidate.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpviews.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpsysmsg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libpasciitab.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/libptimeddlg.a
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.lpi
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/testapp.pas
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile.fpc
-%%PORTEXAMPLES%%share/examples/fpc-%%PORTVERSION%%/fv/Makefile
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fv/views.ppu
diff --git a/devel/fpc-gdbint/Makefile b/devel/fpc-gdbint/Makefile
index 8af87d36427d..2964ce8de5a6 100644
--- a/devel/fpc-gdbint/Makefile
+++ b/devel/fpc-gdbint/Makefile
@@ -1,7 +1,6 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel
PKGNAMESUFFIX= -gdbint
diff --git a/devel/fpc-gdbint/pkg-plist b/devel/fpc-gdbint/pkg-plist
index 7fee578a5fad..9a93d3f1da98 100644
--- a/devel/fpc-gdbint/pkg-plist
+++ b/devel/fpc-gdbint/pkg-plist
@@ -1,6 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gdbint.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbcon.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/libpgdbcon.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbint/gdbint.ppu
diff --git a/devel/fpc-newt/Makefile b/devel/fpc-newt/Makefile
index 2d0a5bb0073e..deefa92aab52 100644
--- a/devel/fpc-newt/Makefile
+++ b/devel/fpc-newt/Makefile
@@ -1,7 +1,6 @@
# Created by: Christopher Key <cjk32@cam.ac.uk>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -newt
diff --git a/devel/fpc-newt/files/patch-packages_newt_fpmake.pp b/devel/fpc-newt/files/patch-packages_newt_fpmake.pp
new file mode 100644
index 000000000000..ccc6e57a82a4
--- /dev/null
+++ b/devel/fpc-newt/files/patch-packages_newt_fpmake.pp
@@ -0,0 +1,11 @@
+--- packages/newt/fpmake.pp.orig 2015-01-05 19:27:06.000000000 +0000
++++ packages/newt/fpmake.pp
+@@ -18,7 +18,7 @@ begin
+ {$endif ALLPACKAGES}
+ P.Version:='3.0.1';
+ P.SourcePath.Add('src');
+- P.OSes:=[Linux];
++ P.OSes:=[Linux,dragonfly,freebsd];
+
+ T:=P.Targets.AddUnit('newt.pp');
+
diff --git a/devel/fpc-newt/pkg-plist b/devel/fpc-newt/pkg-plist
index d1af6a0d9c64..fc8eeedf6fff 100644
--- a/devel/fpc-newt/pkg-plist
+++ b/devel/fpc-newt/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/newt.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/libpnewt.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/newt/newt.ppu
diff --git a/devel/fpc-pthreads/Makefile b/devel/fpc-pthreads/Makefile
index a6e401b845e6..43ae19769d50 100644
--- a/devel/fpc-pthreads/Makefile
+++ b/devel/fpc-pthreads/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -pthreads
diff --git a/devel/fpc-pthreads/pkg-plist b/devel/fpc-pthreads/pkg-plist
index 0084209e365b..bd318c7784dc 100644
--- a/devel/fpc-pthreads/pkg-plist
+++ b/devel/fpc-pthreads/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pthreads.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/libppthreads.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pthreads/pthreads.ppu
diff --git a/devel/fpc-regexpr/Makefile b/devel/fpc-regexpr/Makefile
index 986c200e2303..f7da658988e7 100644
--- a/devel/fpc-regexpr/Makefile
+++ b/devel/fpc-regexpr/Makefile
@@ -1,14 +1,13 @@
# Created by: John Merryweather Cooper et al
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -regexpr
MAINTAINER= freebsd-fpc@FreeBSD.org
COMMENT= Free Pascal regular expression routines
-USE_FPC= yes
+USE_FPC= rtl-objpas
MASTERDIR= ${.CURDIR}/../../lang/fpc
WRKUNITDIR= ${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/devel/fpc-regexpr/pkg-plist b/devel/fpc-regexpr/pkg-plist
index 900bba6964a0..b1cd37e09939 100644
--- a/devel/fpc-regexpr/pkg-plist
+++ b/devel/fpc-regexpr/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/regexpr.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/oldregexpr.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regex.rsj
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpoldregexpr.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregex.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/libpregexpr.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/regexpr/regexpr.ppu
diff --git a/devel/fpc-sdl/Makefile b/devel/fpc-sdl/Makefile
index 3fa01d43b960..692eac7ac4db 100644
--- a/devel/fpc-sdl/Makefile
+++ b/devel/fpc-sdl/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 5
CATEGORIES= devel lang
PKGNAMESUFFIX= -sdl
diff --git a/devel/fpc-sdl/pkg-plist b/devel/fpc-sdl/pkg-plist
index f805b5301e61..4619a2128313 100644
--- a/devel/fpc-sdl/pkg-plist
+++ b/devel/fpc-sdl/pkg-plist
@@ -1,31 +1,21 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/sdl.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.o
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.ppu
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_image.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_gfx.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_mixer_nosmpeg.ppu
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/logger.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_net.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdl_ttf.ppu
%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_image.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_mixer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_mixer_nosmpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_ttf.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_gfx.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdl_net.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsmpeg.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libplogger.a
-%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/libpsdlutils.a
+%%FPC_I386%%lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/sdlutils.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sdl/smpeg.ppu
diff --git a/devel/fpc-symbolic/Makefile b/devel/fpc-symbolic/Makefile
index b9a2fb36fd78..66b54907d9c0 100644
--- a/devel/fpc-symbolic/Makefile
+++ b/devel/fpc-symbolic/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -symbolic
diff --git a/devel/fpc-symbolic/pkg-plist b/devel/fpc-symbolic/pkg-plist
index 6e36901f3af5..88d0fabe5fb6 100644
--- a/devel/fpc-symbolic/pkg-plist
+++ b/devel/fpc-symbolic/pkg-plist
@@ -1,4 +1,6 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.ppu
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/symbolic/optimization.txt
+%%PORTDOCS%%%%DOCSDIR%%-%%PORTVERSION%%/symbolic/symbolic.txt
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/symbolic.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/libpsymbolic.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/symbolic/symbolic.rsj
diff --git a/devel/fpc-zlib/Makefile b/devel/fpc-zlib/Makefile
index 0b42e94bbbad..d2601796a38c 100644
--- a/devel/fpc-zlib/Makefile
+++ b/devel/fpc-zlib/Makefile
@@ -1,7 +1,6 @@
# Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
# $FreeBSD$
-PORTREVISION= 1
CATEGORIES= devel lang
PKGNAMESUFFIX= -zlib
diff --git a/devel/fpc-zlib/pkg-plist b/devel/fpc-zlib/pkg-plist
index dd2b20dd93f0..0d3cbe1d2eed 100644
--- a/devel/fpc-zlib/pkg-plist
+++ b/devel/fpc-zlib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/zlib.fpm
lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/libpzlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/zlib/zlib.ppu