3 files changed, 235 insertions, 190 deletions

diff --git a/devel/fpc-fcl-db/pkg-plist b/devel/fpc-fcl-db/pkg-plist
index 622b87cf5e30..2542945df4b4 100644
--- a/devel/fpc-fcl-db/pkg-plist
+++ b/devel/fpc-fcl-db/pkg-plist
@@ -1,97 +1,125 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsdfdata.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/memds.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/ibconnection.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpibconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/pqconnection.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libppqconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql41conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql4conn.o
-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/libpmysql50conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmysql4conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/odbcconn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpodbcconn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/oracleconnection.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libporacleconnection.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3conn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.ppu
+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/dbcoll.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlscript.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbconst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/db.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbwhtml.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/bufdataset_parser.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/sqlscript.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbconst.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbwhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset_parser.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpbufdataset.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpdbcoll.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlscript.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbcoll.ppu
+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/dbf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_collate.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_common.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_cursor.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_dbffile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_fields.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxcur.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_idxfile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_lang.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_memo.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_parser.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_pgfile.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prscore.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prsdef.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_prssupp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_str.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/dbf_wtil.ppu
+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/fpcgcreatedbf.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu
+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/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/fpdatadict.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
+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/fpdbfexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu
+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/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/fpddfb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu
+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/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/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/fprtfexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu
+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/fpsimplexmlexport.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu
+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/fpsqlparser.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlparser.ppu
+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/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/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_wtil.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
@@ -107,108 +135,92 @@ 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/customsqliteds.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/customsqliteds.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqliteds.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpcustomsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqliteds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqlite3ds.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpparadox.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcsvexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpfixedexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsqlexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplexmlexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpsimplejsonexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdbfexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fptexexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fprtfexport.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpstdexports.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbexport.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/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/libpfpfixedexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsqlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplexmlexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpsimplejsonexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdbfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfptexexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfprtfexport.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpstdexports.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdatadict.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddiff.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpdddbf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqldb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddfb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql40.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql41.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddmysql50.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddodbc.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpq.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddoracle.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddsqlite3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddregstd.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdatadict.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpdddiff.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/libpfpddsqldb.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/libpfpddodbc.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddpq.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddoracle.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddsqlite3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddregstd.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddcodegen.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgcreatedbf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgdbcoll.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgsqlconst.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpcgtiopf.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/fpddpopcode.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpfpddcodegen.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/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/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/libpibconnection.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpmemds.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/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/libpsdfdata.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpsqldb.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/mysql40conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql40conn.ppu
+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/mysql50conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/mysql50conn.ppu
+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/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/paradox.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/paradox.ppu
+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/sdfdata.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sdfdata.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqldb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3conn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/sqlite3ds.ppu
+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/xmldatapacketreader.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/xmldatapacketreader.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db/libpxmldatapacketreader.a
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-db
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
diff --git a/devel/fpc-fcl-json/pkg-plist b/devel/fpc-fcl-json/pkg-plist
index eda871bb08a3..2f464cd230f6 100644
--- a/devel/fpc-fcl-json/pkg-plist
+++ b/devel/fpc-fcl-json/pkg-plist
@@ -1,13 +1,16 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-json/fpjson.ppu
+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/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/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
diff --git a/devel/fpc-fcl-web/pkg-plist b/devel/fpc-fcl-web/pkg-plist
index 2daa2fd3750c..cd019afbc654 100644
--- a/devel/fpc-fcl-web/pkg-plist
+++ b/devel/fpc-fcl-web/pkg-plist
@@ -1,49 +1,79 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/Package.fpc
+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/ezcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.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/custfcgi.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.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/fpapache.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpfcgi.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/cgiapp.o
+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/extjsxml.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/extjsxml.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphttp.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custcgi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custfcgi.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/custweb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/ezcgi.ppu
 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/fpcgi.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpcgi.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/fpdatasetform.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.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/fpextjs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpextjs.ppu
 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/websession.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fphtml.ppu
+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/fpjsonrpc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpjsonrpc.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpdatasetform.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpapache.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/fpweb.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/httpdefs.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/httpdefs.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpcgiapp.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpezcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpfcgi.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.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/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/libpfpapache.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfpcgi.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfcgigate.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/libpwebsession.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libpfphttp.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/libpsqldbwebdata.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/libphttpdefs.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/libpfpdatasetform.a
+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/webjsonrpc.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webjsonrpc.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webpage.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/websession.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web/webutil.ppu
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fcl-web
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units