- Update to 2.2.2

14 files changed, 19 insertions, 39 deletions

diff --git a/databases/fpc-gdbm/Makefile b/databases/fpc-gdbm/Makefile
index 6013f13b4dfc..e651bc9d8dbc 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
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to the GNU database system
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/extra/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	GDBM	"Install the GNU database manager"	on
diff --git a/databases/fpc-gdbm/pkg-plist b/databases/fpc-gdbm/pkg-plist
index 19f58ca1c092..27a7e6aa452a 100644
--- a/databases/fpc-gdbm/pkg-plist
+++ b/databases/fpc-gdbm/pkg-plist
@@ -2,12 +2,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/Package.fpc
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.ppu
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/gdbm.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm/libpgdbm.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbm/testgdbm2.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/gdbm/testgdbm.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/gdbm
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/gdbm
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-ibase/Makefile b/databases/fpc-ibase/Makefile
index fd3a53e791d9..28d4eb85abe7 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
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to interbase
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	IBASE	"Install Interbase/Firebird client"	on
diff --git a/databases/fpc-ibase/pkg-plist b/databases/fpc-ibase/pkg-plist
index 1d6378987e9a..4c5d87b14401 100644
--- a/databases/fpc-ibase/pkg-plist
+++ b/databases/fpc-ibase/pkg-plist
@@ -8,12 +8,8 @@ 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
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ibase/testib60.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/ibase/testib40.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/ibase
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/ibase
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-mysql/Makefile b/databases/fpc-mysql/Makefile
index 92677d8b23bd..434e05b80d3b 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
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to MySQL
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	MYSQL	"Install MySQL client"	on
diff --git a/databases/fpc-mysql/pkg-plist b/databases/fpc-mysql/pkg-plist
index b751df046339..9ff00c35307d 100644
--- a/databases/fpc-mysql/pkg-plist
+++ b/databases/fpc-mysql/pkg-plist
@@ -50,12 +50,8 @@ 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
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%/mysql
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-odbc/Makefile b/databases/fpc-odbc/Makefile
index 337434f9d54e..2bb30d108425 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
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to ODBC
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	ODBC	"Install ODBC library suite for Unix"	on
diff --git a/databases/fpc-odbc/pkg-plist b/databases/fpc-odbc/pkg-plist
index 3780e008d4ca..f71ce879f20f 100644
--- a/databases/fpc-odbc/pkg-plist
+++ b/databases/fpc-odbc/pkg-plist
@@ -5,11 +5,8 @@ lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsql.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/odbcsqldyn.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsql.a
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc/libpodbcsqldyn.a
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/odbc/testodbc.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/odbc
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/odbc
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-oracle/Makefile b/databases/fpc-oracle/Makefile
index 00c3ae8daa36..9da736f8dc76 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
 
@@ -15,7 +15,9 @@ COMMENT=	Free Pascal interface to Oracle
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
+OPTIONS=	ORACLE	"Install oracle client"	on
+
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/fpc-oracle/pkg-plist b/databases/fpc-oracle/pkg-plist
index 184a2dda071e..4809715c00a6 100644
--- a/databases/fpc-oracle/pkg-plist
+++ b/databases/fpc-oracle/pkg-plist
@@ -11,14 +11,8 @@ 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
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/oracle/Makefile
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/oracle
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/oracle
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-postgres/Makefile b/databases/fpc-postgres/Makefile
index 31bda127609c..b72b5dabbcdb 100644
--- a/databases/fpc-postgres/Makefile
+++ b/databases/fpc-postgres/Makefile
@@ -5,7 +5,7 @@
 # $FreeBSD$
 #
 
-PORTREVISION=	2
+PORTREVISION=	0
 CATEGORIES=	databases lang
 PKGNAMESUFFIX=	-postgres
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to PostGreSQL
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	PGSQL	"Install PostgreSQL client"	on
diff --git a/databases/fpc-postgres/pkg-plist b/databases/fpc-postgres/pkg-plist
index 1cc768cba64d..018094796a0c 100644
--- a/databases/fpc-postgres/pkg-plist
+++ b/databases/fpc-postgres/pkg-plist
@@ -14,12 +14,8 @@ 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
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/postgres/testpg2.pp
-%%PORTDOCS%%share/examples/fpc-%%PORTVERSION%%/postgres/testpg1.pp
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/postgres
 @dirrmtry lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%
 @dirrmtry lib/fpc/%%PORTVERSION%%/units
 @dirrmtry lib/fpc/%%PORTVERSION%%
 @dirrmtry lib/fpc
-%%PORTDOCS%%@dirrm share/examples/fpc-%%PORTVERSION%%/postgres
-%%PORTDOCS%%@dirrmtry share/examples/fpc-%%PORTVERSION%%
diff --git a/databases/fpc-sqlite/Makefile b/databases/fpc-sqlite/Makefile
index 9b3e243a93b9..02b0fe88be6d 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
 
@@ -15,7 +15,7 @@ COMMENT=	Free Pascal interface to SQLite
 USE_FPC=	yes
 
 MASTERDIR=	${.CURDIR}/../../lang/fpc
-WRKUNITDIR=	${FPCSRCDIR}/packages/base/${PKGNAMESUFFIX:S/-//}
+WRKUNITDIR=	${FPCSRCDIR}/packages/${PKGNAMESUFFIX:S/-//}
 EXTRACTUNITDIR+=	${WRKUNITDIR}
 
 OPTIONS=	SQLITE	"Install SQLite database engine"	on
diff --git a/databases/fpc-sqlite/pkg-plist b/databases/fpc-sqlite/pkg-plist
index 8d89c0debe55..7078bc4ca113 100644
--- a/databases/fpc-sqlite/pkg-plist
+++ b/databases/fpc-sqlite/pkg-plist
@@ -2,6 +2,7 @@ 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%%/units/%%BUILDNAME%%/sqlite/sqlite.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlite.ppu
@@ -9,6 +10,8 @@ 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/sqlitedb.o
 lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite/sqlitedb.ppu
 @dirrm lib/fpc/%%PORTVERSION%%/units/%%BUILDNAME%%/sqlite