10 files changed, 51 insertions, 21 deletions

diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index 3ba921c340bb..c3511987fc31 100644
--- a/databases/fpc-gdbm/Makefile
+++ b/databases/fpc-gdbm/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-gdbm
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc \
 LIB_DEPENDS=	gdbm.3:${PORTSDIR}/databases/gdbm
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index 60da65441185..e5f8e8a1021f 100644
--- a/databases/fpc-ibase/Makefile
+++ b/databases/fpc-ibase/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-ibase
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 LIB_DEPENDS=	fbembed.1:${PORTSDIR}/databases/firebird-client
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index c21f1f755844..cf39e3f3e4a1 100644
--- a/databases/fpc-mysql/Makefile
+++ b/databases/fpc-mysql/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-mysql
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 USE_MYSQL=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index 76466c8a400a..b751df046339 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -10,10 +10,16 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_version.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3_comdyn.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql3dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql40dyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql41.ppu
+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/my4_sys.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_com.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql4_version.o
 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
@@ -21,6 +27,12 @@ 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/mysql50.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql/mysql50dyn.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
@@ -32,6 +44,12 @@ 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
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/mysql/testdb3.pp
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/mysql/testdb4.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/mysql
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index 956f19ecdc1f..a38d3d2f5ece 100644
--- a/databases/fpc-odbc/Makefile
+++ b/databases/fpc-odbc/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-odbc
 
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 LIB_DEPENDS=	odbc.1:${PORTSDIR}/databases/unixODBC
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index bcba3d0537c8..925e537da868 100644
--- a/databases/fpc-oracle/Makefile
+++ b/databases/fpc-oracle/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-oracle
 
@@ -17,7 +17,7 @@ RUN_DEPENDS=	${ORACLE8_LIB}/env_rdbms.mk:${PORTSDIR}/databases/oracle8-client
 
 ORACLE8_LIB=	${LOCALBASE}/oracle8-client/rdbms/lib
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
index 89188f984d22..184a2dda071e 100644
--- a/databases/fpc-oracle/pkg-plist
+++ b/databases/fpc-oracle/pkg-plist
@@ -1,7 +1,16 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.o
+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%%/units/%%BUILDNAME%%/oracle/oci.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oci.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/ocidyn.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oraoci.ppu
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle/oratypes.ppu
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/test01.pp
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/oraclew.pp
 %%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/Makefile.fpc
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 32f46b39af21..689b12624dec 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 USE_PGSQL=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 HAVE_EXAMPLES=	true
 
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index a1160ed396a9..026e5a761e5b 100644
--- a/databases/fpc-sqlite/Makefile
+++ b/databases/fpc-sqlite/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	1
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-sqlite
 
@@ -17,7 +17,7 @@ BUILD_DEPENDS=	ppc386:${PORTSDIR}/lang/fpc
 USE_SQLITE=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${PORTNAME}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
index 068467bbec80..49db37737955 100644
--- a/databases/fpc-sqlite/pkg-plist
+++ b/databases/fpc-sqlite/pkg-plist
@@ -1,10 +1,13 @@
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/Package.fpc
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.ppu
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.o
-lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite3.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlite3.a
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/libpsqlitedb.a
+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/sqlitedb.o
+lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units