20 files changed, 68 insertions, 117 deletions
diff --git a/databases/fpc-dblib/Makefile b/databases/fpc-dblib/Makefile
index ae7e1f97e191..8428d910cb18 100644
--- a/databases/fpc-dblib/Makefile
+++ b/databases/fpc-dblib/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-dblib
 
diff --git a/databases/fpc-dblib/pkg-plist b/databases/fpc-dblib/pkg-plist
index 3c6598fd05ba..62e6e45d7080 100644
--- a/databases/fpc-dblib/pkg-plist
+++ b/databases/fpc-dblib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/dblib.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/libpdblib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/dblib/dblib.ppu
diff --git a/databases/fpc-fpindexer/Makefile b/databases/fpc-fpindexer/Makefile
index 34745c319e6f..6ce22662cdb6 100644
--- a/databases/fpc-fpindexer/Makefile
+++ b/databases/fpc-fpindexer/Makefile
@@ -1,14 +1,14 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	2
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-fpindexer
 
 MAINTAINER=	freebsd-fpc@FreeBSD.org
 COMMENT=	Database indexer with database/flat file backend
 
-USE_FPC=	chm fcl-base fcl-db fcl-xml ibase sqlite
+USE_FPC=	chm dblib fcl-base fcl-db fcl-json fcl-xml ibase mysql odbc \
+		oracle postgres pxlib sqlite rtl-extra
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
 WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
diff --git a/databases/fpc-fpindexer/pkg-plist b/databases/fpc-fpindexer/pkg-plist
index b56d005fb150..e2aca4d3d286 100644
--- a/databases/fpc-fpindexer/pkg-plist
+++ b/databases/fpc-fpindexer/pkg-plist
@@ -1,10 +1,11 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/fpindexer.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/dbindexer.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fbindexdb.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpindexer.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/fpmasks.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderhtml.o
@@ -13,16 +14,10 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireaderpas.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/ireadertxt.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpdbindexer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfbindexdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfpindexer.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpfpmasks.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireaderhtml.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireaderpas.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpireadertxt.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpmemindexdb.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/libpsqldbindexdb.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/memindexdb.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqldbindexdb.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/fpindexer/sqliteindexdb.ppu
diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index f1be67502261..c09f8870bc35 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm
 
diff --git a/databases/fpc-gdbm/pkg-plist b/databases/fpc-gdbm/pkg-plist
index 116bff00ccb5..63f4bd1bc28a 100644
--- a/databases/fpc-gdbm/pkg-plist
+++ b/databases/fpc-gdbm/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/gdbm.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/libpgdbm.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index bbfa1d75d43d..45603a4eedc3 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -1,7 +1,6 @@
 # Created by: John Merryweather Cooper
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-ibase
 
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
index afe62f8fa9b6..a88e1df3b1b3 100644
--- a/databases/fpc-ibase/pkg-plist
+++ b/databases/fpc-ibase/pkg-plist
@@ -1,10 +1,8 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/ibase.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase40.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/libpibase60dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase/ibase60dyn.rsj
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 5154dc6f6f22..dde1ae6df15f 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -1,7 +1,6 @@
 # Created by: John Merryweather Cooper
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-mysql
 
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index 78ffa8644b6c..636a2c0be48f 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -1,70 +1,54 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/Package.fpc
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/mysql.fpm
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/my4_sys.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4dyn.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql51dyn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql55dyn.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmy4_sys.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_com.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_version.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql4_comdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_com.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_version.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3_comdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql3dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql40.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql40dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql41dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql50dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql51dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql55.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql55dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql56.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/libpmysql56dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql56dyn.rsj
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql57dyn.rsj
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index c70671eaa36a..6f3f3c29750a 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -1,7 +1,6 @@
 # Created by: John Merryweather Cooper
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-odbc
 
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
index fb2cd36bca07..5ae1211db17a 100644
--- a/databases/fpc-odbc/pkg-plist
+++ b/databases/fpc-odbc/pkg-plist
@@ -1,7 +1,5 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/odbc.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsql.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsqldyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.ppu
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 86ac7790056b..3fe020119dfa 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -1,7 +1,6 @@
 # Created by: John Merryweather Cooper et al
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-oracle
 
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
index b2f5db866fb2..ca4f22e82aa3 100644
--- a/databases/fpc-oracle/pkg-plist
+++ b/databases/fpc-oracle/pkg-plist
@@ -1,8 +1,4 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libpoci.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libpocidyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libporaoci.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/libporatypes.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/oracle.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.o
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index fecf1d15f2b8..48c946625f31 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -1,7 +1,6 @@
 # Created by: John Merryweather Cooper et al
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
index e2098fe5334c..483d8977088b 100644
--- a/databases/fpc-postgres/pkg-plist
+++ b/databases/fpc-postgres/pkg-plist
@@ -1,16 +1,12 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/postgres.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllist.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/dllistdyn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libpdllist.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libpdllistdyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/libppostgres3dyn.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres/postgres3dyn.rsj
diff --git a/databases/fpc-pxlib/Makefile b/databases/fpc-pxlib/Makefile
index 3406cae02d1e..8b629b0b5061 100644
--- a/databases/fpc-pxlib/Makefile
+++ b/databases/fpc-pxlib/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.org>
 # $FreeBSD$
 
-PORTREVISION=	1
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-pxlib
 
diff --git a/databases/fpc-pxlib/pkg-plist b/databases/fpc-pxlib/pkg-plist
index b9c9ba945a5b..ea5fb2c371ee 100644
--- a/databases/fpc-pxlib/pkg-plist
+++ b/databases/fpc-pxlib/pkg-plist
@@ -1,4 +1,3 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.ppu
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/pxlib.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/libppxlib.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/pxlib/pxlib.ppu
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 4a35f0547bae..3a4a8f43cf7a 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -1,7 +1,6 @@
 # Created by: Alonso Cardenas Marquez <acm@FreeBSD.rog>
 # $FreeBSD$
 
-PORTREVISION=	2
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-sqlite
 
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
index e36ebf29faee..2043e7d0d6ae 100644
--- a/databases/fpc-sqlite/pkg-plist
+++ b/databases/fpc-sqlite/pkg-plist
@@ -1,16 +1,12 @@
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3db.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3dyn.a
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlitedb.a
+lib/fpc/%%PORTVERSION%%/fpmkinst/%%BUILDNAME%%/sqlite.fpm
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3db.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3dyn.rsj
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu