Update libgda3 to 3.0.2, and split out the various database backends as

slave ports.

Submitted by:	kwm

31 files changed, 383 insertions, 394 deletions

diff --git a/databases/Makefile b/databases/Makefile
index 5342b69abe29..eb8526e6d5c4 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -105,6 +105,13 @@
     SUBDIR += libgda2
     SUBDIR += libgda2-reference
     SUBDIR += libgda3
+    SUBDIR += libgda3-firebird
+    SUBDIR += libgda3-freetds
+    SUBDIR += libgda3-ldap
+    SUBDIR += libgda3-mdb
+    SUBDIR += libgda3-mysql
+    SUBDIR += libgda3-odbc
+    SUBDIR += libgda3-postgresql
     SUBDIR += libgda3-reference
     SUBDIR += libgdamm
     SUBDIR += libgnomedb
diff --git a/databases/libgda3-firebird/Makefile b/databases/libgda3-firebird/Makefile
new file mode 100644
index 000000000000..9d4f67ce25d3
--- /dev/null
+++ b/databases/libgda3-firebird/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-firebird/Makefile,v 1.2 2008/02/26 21:23:34 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-firebird
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides firebird backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	firebird
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-firebird/pkg-plist b/databases/libgda3-firebird/pkg-plist
new file mode 100644
index 000000000000..cb15b864816e
--- /dev/null
+++ b/databases/libgda3-firebird/pkg-plist
@@ -0,0 +1,5 @@
+lib/libgda-%%VERSION%%/providers/libgda-firebird.a
+lib/libgda-%%VERSION%%/providers/libgda-firebird.la
+lib/libgda-%%VERSION%%/providers/libgda-firebird.so
+libdata/pkgconfig/libgda-firebird-%%VERSION%%.pc
+share/libgda-%%VERSION%%/firebird_specs_dsn.xml
diff --git a/databases/libgda3-freetds/Makefile b/databases/libgda3-freetds/Makefile
new file mode 100644
index 000000000000..e4c016b4db36
--- /dev/null
+++ b/databases/libgda3-freetds/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-freetds/Makefile,v 1.2 2008/02/26 21:23:34 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-freetds
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides freetds backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	freetds
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-freetds/pkg-plist b/databases/libgda3-freetds/pkg-plist
new file mode 100644
index 000000000000..f42cd90f3d00
--- /dev/null
+++ b/databases/libgda3-freetds/pkg-plist
@@ -0,0 +1,10 @@
+lib/libgda-%%VERSION%%/providers/libgda-firebird.a
+lib/libgda-%%VERSION%%/providers/libgda-firebird.la
+lib/libgda-%%VERSION%%/providers/libgda-firebird.so
+lib/libgda-%%VERSION%%/providers/libgda-freetds.a
+lib/libgda-%%VERSION%%/providers/libgda-freetds.la
+lib/libgda-%%VERSION%%/providers/libgda-freetds.so
+libdata/pkgconfig/libgda-firebird-%%VERSION%%.pc
+libdata/pkgconfig/libgda-freetds-%%VERSION%%.pc
+share/libgda-%%VERSION%%/firebird_specs_dsn.xml
+share/libgda-%%VERSION%%/freetds_specs_dsn.xml
diff --git a/databases/libgda3-ldap/Makefile b/databases/libgda3-ldap/Makefile
new file mode 100644
index 000000000000..3fd40db2d302
--- /dev/null
+++ b/databases/libgda3-ldap/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-ldap/Makefile,v 1.2 2008/02/26 21:23:34 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-ldap
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides ldap backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	ldap
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-ldap/pkg-plist b/databases/libgda3-ldap/pkg-plist
new file mode 100644
index 000000000000..d8b54ee06808
--- /dev/null
+++ b/databases/libgda3-ldap/pkg-plist
@@ -0,0 +1,5 @@
+lib/libgda-%%VERSION%%/providers/libgda-ldap.a
+lib/libgda-%%VERSION%%/providers/libgda-ldap.la
+lib/libgda-%%VERSION%%/providers/libgda-ldap.so
+libdata/pkgconfig/libgda-ldap-%%VERSION%%.pc
+share/libgda-%%VERSION%%/ldap_specs_dsn.xml
diff --git a/databases/libgda3-mdb/Makefile b/databases/libgda3-mdb/Makefile
new file mode 100644
index 000000000000..6a02f5a3177c
--- /dev/null
+++ b/databases/libgda3-mdb/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-mdb/Makefile,v 1.2 2008/02/26 21:23:34 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-mdb
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides mdb backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	mdb
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-mdb/pkg-plist b/databases/libgda3-mdb/pkg-plist
new file mode 100644
index 000000000000..30b1df5d9f44
--- /dev/null
+++ b/databases/libgda3-mdb/pkg-plist
@@ -0,0 +1,5 @@
+lib/libgda-%%VERSION%%/providers/libgda-mdb.a
+lib/libgda-%%VERSION%%/providers/libgda-mdb.la
+lib/libgda-%%VERSION%%/providers/libgda-mdb.so
+libdata/pkgconfig/libgda-mdb-%%VERSION%%.pc
+share/libgda-%%VERSION%%/mdb_specs_dsn.xml
diff --git a/databases/libgda3-mysql/Makefile b/databases/libgda3-mysql/Makefile
new file mode 100644
index 000000000000..ad05df8abdb2
--- /dev/null
+++ b/databases/libgda3-mysql/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-mysql/Makefile,v 1.2 2008/02/26 21:23:35 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-mysql
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides mysql backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	mysql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-mysql/pkg-plist b/databases/libgda3-mysql/pkg-plist
new file mode 100644
index 000000000000..de93385653ba
--- /dev/null
+++ b/databases/libgda3-mysql/pkg-plist
@@ -0,0 +1,14 @@
+lib/libgda-%%VERSION%%/providers/libgda-mysql.a
+lib/libgda-%%VERSION%%/providers/libgda-mysql.la
+lib/libgda-%%VERSION%%/providers/libgda-mysql.so
+libdata/pkgconfig/libgda-mysql-%%VERSION%%.pc
+share/libgda-%%VERSION%%/mysql_specs_add_column.xml
+share/libgda-%%VERSION%%/mysql_specs_create_db.xml
+share/libgda-%%VERSION%%/mysql_specs_create_index.xml
+share/libgda-%%VERSION%%/mysql_specs_create_table.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_column.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_db.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_index.xml
+share/libgda-%%VERSION%%/mysql_specs_drop_table.xml
+share/libgda-%%VERSION%%/mysql_specs_dsn.xml
+share/libgda-%%VERSION%%/mysql_specs_rename_table.xml
diff --git a/databases/libgda3-odbc/Makefile b/databases/libgda3-odbc/Makefile
new file mode 100644
index 000000000000..a0f20a363fe9
--- /dev/null
+++ b/databases/libgda3-odbc/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-odbc/Makefile,v 1.2 2008/02/26 21:23:35 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-odbc
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides odbc backend for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	odbc
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-odbc/pkg-plist b/databases/libgda3-odbc/pkg-plist
new file mode 100644
index 000000000000..904d1445e482
--- /dev/null
+++ b/databases/libgda3-odbc/pkg-plist
@@ -0,0 +1,5 @@
+lib/libgda-%%VERSION%%/providers/libgda-odbc.a
+lib/libgda-%%VERSION%%/providers/libgda-odbc.la
+lib/libgda-%%VERSION%%/providers/libgda-odbc.so
+libdata/pkgconfig/libgda-odbc-%%VERSION%%.pc
+share/libgda-%%VERSION%%/odbc_specs_dsn.xml
diff --git a/databases/libgda3-postgresql/Makefile b/databases/libgda3-postgresql/Makefile
new file mode 100644
index 000000000000..4fae3399ae44
--- /dev/null
+++ b/databases/libgda3-postgresql/Makefile
@@ -0,0 +1,23 @@
+# New ports collection makefile for:	libgda2
+# Date created:				02 June 2002
+# Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
+#
+# $FreeBSD$
+#   $MCom: ports/databases/libgda3-postgresql/Makefile,v 1.2 2008/02/26 21:23:35 kwm Exp $
+#
+
+PORTREVISION?=	0
+CATEGORIES=	databases gnome
+PKGNAMESUFFIX?=	-postgresql
+
+MAINTAINER=	gnome@FreeBSD.org
+COMMENT=	Provides postgresql access for the libgda3 library
+
+MASTERDIR=	${.CURDIR}/../libgda3
+BUILD_WRKSRC=	${WRKSRC}/providers/postgres/
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+PLIST=		${.CURDIR}/pkg-plist
+
+LIBGDA3_SLAVE=	postgresql
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/libgda3-postgresql/pkg-plist b/databases/libgda3-postgresql/pkg-plist
new file mode 100644
index 000000000000..8c0d2adbcb72
--- /dev/null
+++ b/databases/libgda3-postgresql/pkg-plist
@@ -0,0 +1,14 @@
+lib/libgda-%%VERSION%%/providers/libgda-postgres.a
+lib/libgda-%%VERSION%%/providers/libgda-postgres.la
+lib/libgda-%%VERSION%%/providers/libgda-postgres.so
+libdata/pkgconfig/libgda-postgres-%%VERSION%%.pc
+share/libgda-%%VERSION%%/postgres_specs_add_column.xml
+share/libgda-%%VERSION%%/postgres_specs_create_db.xml
+share/libgda-%%VERSION%%/postgres_specs_create_index.xml
+share/libgda-%%VERSION%%/postgres_specs_create_table.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_column.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_db.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_index.xml
+share/libgda-%%VERSION%%/postgres_specs_drop_table.xml
+share/libgda-%%VERSION%%/postgres_specs_dsn.xml
+share/libgda-%%VERSION%%/postgres_specs_rename_table.xml
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index f06f03797dc4..51ed38d35be1 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -3,22 +3,23 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda3/Makefile,v 1.5 2007/10/21 03:13:52 mezz Exp $
+#   $MCom: ports/databases/libgda3/Makefile,v 1.11 2008/03/01 02:35:38 mezz Exp $
 #
 
 PORTNAME=	libgda3
-PORTVERSION=	1.9.102
-PORTREVISION?=	4
+PORTVERSION?=	3.0.2
+PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/3$//}/${PORTVERSION:R}
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
-MAINTAINER=	gnome@FreeBSD.org
-COMMENT=	Provides uniform access to different kinds of data sources
+MAINTAINER?=	gnome@FreeBSD.org
+COMMENT?=	Provides uniform access to different kinds of data sources
 
 USE_BZIP2=	yes
+LIBGDA3_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
 
@@ -31,161 +32,84 @@ USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-CONFIGURE_ARGS=	--without-bdb
+CONFIGURE_ARGS=	--without-bdb --without-sybase
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
-MAN1=		gda-config-tool.1
-MAN5=		gda-config.5
-
-PLIST_SUB=	VERSION=${PORTVERSION:R}
-
-CONFLICTS=	libgda2-[0-9]*
-
-post-patch:
-	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
-		${WRKSRC}/Makefile.in
-
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/mysql/libmysqlclient.so)
-WITH_MYSQL=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libldap.so.2)
-WITH_LDAP=yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libgds.so.1)
-WITH_FIREBIRD=	yes
-.elif exists(${LOCALBASE}/lib/libgds.so.2)
-WITHOUT_FIREBIRD=yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libtds.so.2)
-WITH_FREETDS=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libsybdb.so.3)
-WITH_SYBASE=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libmdbsql.so.0)
-WITH_MDB=	yes
-.endif
-
-.if exists(${LOCALBASE}/lib/libODBC.so.1)
-WITH_ODBC=	yes
+.if ${LIBGDA3_SLAVE}=="no"
+MAN1=		gda-config-tool-3.0.1
+MAN5=		gda-config-3.0.5
+.else
+USE_GNOME+=	libgda3
 .endif
 
-.if exists(${LOCALBASE}/lib/libsqlite.so.2)
-WITH_SQLITE=	yes
-.endif
+PLIST_SUB=	VERSION=${PORTVERSION:R}
 
-.if !defined(WITH_MYSQL)
-PLIST_SUB+=		MYSQL:="@comment "
-CONFIGURE_ARGS+=	--without-mysql
-.else
+.if ${LIBGDA3_SLAVE}=="mysql"
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB+=		MYSQL:=""
+.else
+CONFIGURE_ARGS+=	--without-mysql
 .endif
 
-.if !defined(WITHOUT_PGSQL) && defined(WITH_PGSQL)
+.if ${LIBGDA3_SLAVE}=="postgresql"
 USE_PGSQL=		yes
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
-PLIST_SUB+=		POSTGRES:=""
 .else
-PLIST_SUB+=		POSTGRES:="@comment "
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if !defined(WITHOUT_LDAP) && defined(WITH_LDAP)
+.if ${LIBGDA3_SLAVE}=="ldap"
 USE_OPENLDAP=		yes
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-PLIST_SUB+=		LDAP:=""
 .else
 CONFIGURE_ARGS+=	--without-ldap
-PLIST_SUB+=		LDAP:="@comment "
 .endif
 
-.if !defined(WITHOUT_FIREBIRD) && defined(WITH_FIREBIRD)
-LIB_DEPENDS+=		gds.1:${PORTSDIR}/databases/firebird-client
+.if ${LIBGDA3_SLAVE}=="firebird"
+LIB_DEPENDS+=		gds.2:${PORTSDIR}/databases/firebird2-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
-PLIST_SUB+=		FIREBIRD:=""
 .else
 CONFIGURE_ARGS+=	--without-firebird
-PLIST_SUB+=		FIREBIRD:="@comment "
 .endif
 
-.if !defined(WITHOUT_FREETDS) && defined(WITH_FREETDS)
-LIB_DEPENDS+=		tds.2:${PORTSDIR}/databases/freetds
+.if ${LIBGDA3_SLAVE}=="freetds"
+LIB_DEPENDS+=		tds.5:${PORTSDIR}/databases/freetds
 CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
-PLIST_SUB+=		FREETDS:=""
 .else
 CONFIGURE_ARGS+=	--without-tds
-PLIST_SUB+=		FREETDS:="@comment "
 .endif
 
-.if !defined(WITHOUT_SYBASE) && defined(WITH_SYBASE)
-LIB_DEPENDS+=		sybdb.3:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+=	--with-sybase=${LOCALBASE}
-PLIST_SUB+=		SYBASE:=""
-.else
-CONFIGURE_ARGS+=	--without-sybase
-PLIST_SUB+=		SYBASE:="@comment "
-.endif
-
-.if !defined(WITHOUT_MDB) && defined(WITH_MDB)
+.if ${LIBGDA3_SLAVE}=="mds"
 LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
 CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
-PLIST_SUB+=		MDB:=""
 .else
 CONFIGURE_ARGS+=	--without-mdb
-PLIST_SUB+=		MDB:="@comment "
 .endif
 
-.if !defined(WITHOUT_ODBC) && defined(WITH_ODBC)
+.if ${LIBGDA3_SLAVE}=="odbc"
 LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
 CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
-PLIST_SUB+=		ODBC:=""
 .else
 CONFIGURE_ARGS+=	--without-odbc
-PLIST_SUB+=		ODBC:="@comment "
-.endif
-
-.if !defined(WITHOUT_SQLITE) && defined(WITH_SQLITE)
-LIB_DEPENDS+=		sqlite.2:${PORTSDIR}/databases/sqlite2
-CONFIGURE_ARGS+=	--with-sqlite=${LOCALBASE}
-PLIST_SUB+=		SQLITE:=""
-.else
-CONFIGURE_ARGS+=	--without-sqlite
-PLIST_SUB+=		SQLITE:="@comment "
 .endif
 
-pre-everything::
-.if !defined(WITH_MYSQL)
-	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
-.endif
-.if !defined(WITH_LDAP)
-	@${ECHO_MSG} "You can enable support for LDAP databases by defining WITH_LDAP."
-.endif
-.if !defined(WITH_FREETDS)
-	@${ECHO_MSG} "You can enable support for TDS databases by defining WITH_FREETDS."
-.endif
-.if !defined(WITH_SYBASE)
-	@${ECHO_MSG} "You can enable support for Sybase databases by defining WITH_SYBASE."
-.endif
-.if !defined(WITH_MDB)
-	@${ECHO_MSG} "You can enable support for MDB databases by defining WITH_MDB."
-.endif
-.if !defined(WITH_ODBC)
-	@${ECHO_MSG} "You can enable support for ODBC databases by defining WITH_ODBC."
-.endif
-.if !defined(WITH_SQLITE)
-	@${ECHO_MSG} "You can enable support for SQLITE databases by defining WITH_SQLITE."
+post-patch:
+	@${REINPLACE_CMD} -e "/^SUBDIRS =/s/testing//" \
+		${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-ldl||g' ${WRKSRC}/configure
+.for d in fts1.c fts1_porter.c fts1_tokenizer1.c
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|g' \
+		${WRKSRC}/providers/sqlite/sqlite-src/${d}
+.endfor
+.if ${LIBGDA3_SLAVE}!="no"
+. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
+	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/|${LOCALBASE}/lib/|g' \
+		${WRKSRC}/providers/${d}/Makefile.in
+. endfor
 .endif
 
 .include <bsd.port.post.mk>
-
 .endif
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index cc6c915ac462..9c80a6259295 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-1.9.102.tar.bz2) = 5a97f6a00fe1cbd369be14b70dbee261
-SHA256 (gnome2/libgda-1.9.102.tar.bz2) = 6c01444976afe7b37e9b146ea9311c1da7cc8965d2aa4182e7f452843ecaa702
-SIZE (gnome2/libgda-1.9.102.tar.bz2) = 1935950
+MD5 (gnome2/libgda-3.0.2.tar.bz2) = 81969ad23b58517b83eee69875d696a1
+SHA256 (gnome2/libgda-3.0.2.tar.bz2) = 4e6c3df1cc5c371ca4685993d961e81026a3f73bd74d8081ffd41085d994d32c
+SIZE (gnome2/libgda-3.0.2.tar.bz2) = 2902232
diff --git a/databases/libgda3/files/patch-aa b/databases/libgda3/files/patch-aa
deleted file mode 100644
index 283a9d65994a..000000000000
--- a/databases/libgda3/files/patch-aa
+++ /dev/null
@@ -1,10 +0,0 @@
---- Makefile.in.orig	Thu Oct 13 15:37:21 2005
-+++ Makefile.in	Thu Oct 13 15:37:38 2005
-@@ -345,7 +345,6 @@
- 	report \
- 	tools \
- 	gda-sharp \
--	testing \
- 	data \
- 	doc
- 
diff --git a/databases/libgda3/files/patch-configure b/databases/libgda3/files/patch-configure
index 8df5044bbd58..23dded5f5ca9 100644
--- a/databases/libgda3/files/patch-configure
+++ b/databases/libgda3/files/patch-configure
@@ -1,11 +1,12 @@
---- configure.orig	Tue Apr  6 14:10:07 2004
-+++ configure	Tue Apr  6 14:10:19 2004
-@@ -23012,7 +23012,7 @@
- _ACEOF
- 
- 		FIREBIRD_CFLAGS="-I${firebirddir}/include"
--		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -ldl -lcrypt"
-+		FIREBIRD_LIBS="-L${firebirddir}/lib -lgds -lcrypt"
- 	fi
- fi
-
+--- configure.orig	2008-01-31 22:16:42.000000000 +0100
++++ configure	2008-01-31 22:19:04.000000000 +0100
+@@ -24065,6 +24065,9 @@ echo "$as_me: WARNING: Postgres backend 
+                 elif test -f ${postgresdir}/include/postgresql/7.4/libpq-fe.h
+ 		then
+ 			POSTGRES_CFLAGS=-I${postgresdir}/include/7.4/postgresql
++		elif test -f ${postgresdir}/include/postgresql/server/server/c.h
++		then
++			POSTGRES_CFLAGS=-I${postgresdir}/include/postgresql
+ 		else
+ 			{ echo "$as_me:$LINENO: WARNING: Postgres include files not found" >&5
+ echo "$as_me: WARNING: Postgres include files not found" >&2;}
diff --git a/databases/libgda3/files/patch-doc_C_Makefile.in b/databases/libgda3/files/patch-doc_C_Makefile.in
deleted file mode 100644
index ef37c3190b54..000000000000
--- a/databases/libgda3/files/patch-doc_C_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/C/Makefile.in.orig	Thu Jul 22 10:35:19 2004
-+++ doc/C/Makefile.in	Thu Jul 22 10:35:48 2004
-@@ -116,7 +116,7 @@
- HISTORY_LIB = @HISTORY_LIB@
- HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
- HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
- IBMDB2_CFLAGS = @IBMDB2_CFLAGS@
- IBMDB2_FALSE = @IBMDB2_FALSE@
- IBMDB2_LIBS = @IBMDB2_LIBS@
diff --git a/databases/libgda3/files/patch-libgda-2.0.pc.in b/databases/libgda3/files/patch-libgda-2.0.pc.in
deleted file mode 100644
index 4e4c405698b4..000000000000
--- a/databases/libgda3/files/patch-libgda-2.0.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda-2.0.pc.in.orig   Fri Oct 31 21:59:33 2003
-+++ libgda-2.0.pc.in        Fri Oct 31 22:00:52 2003
-@@ -5,7 +5,7 @@
-  
- Name: libgda
- Description: GDA (GNOME Data Access) library
--Requires: glib-2.0 libxml-2.0 libxslt
-+Requires: glib-2.0 gthread-2.0 gmodule-2.0 libxml-2.0 libxslt
- Version: @VERSION@
- Libs: -L${libdir} -lgda-2
- Cflags: -I${includedir}
diff --git a/databases/libgda3/files/patch-libgda__gda-value.c b/databases/libgda3/files/patch-libgda__gda-value.c
deleted file mode 100644
index 5a57ca4c4bc4..000000000000
--- a/databases/libgda3/files/patch-libgda__gda-value.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgda/gda-value.c.orig	Fri Mar 17 11:08:32 2006
-+++ libgda/gda-value.c	Fri Mar 24 22:31:12 2006
-@@ -1281,8 +1281,8 @@ gda_value_is_null (GdaValue *value)
- gboolean
- gda_value_is_number (GdaValue *value)
- {
--	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
- 	GdaValueType type;
-+	g_return_val_if_fail (value && G_IS_VALUE(value), FALSE);
- 	
- 	type = GDA_VALUE_TYPE(value);
- 	switch (type) {
diff --git a/databases/libgda3/files/patch-libgda_gda-query-target.c b/databases/libgda3/files/patch-libgda_gda-query-target.c
deleted file mode 100644
index fbdcaf721fa3..000000000000
--- a/databases/libgda3/files/patch-libgda_gda-query-target.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgda/gda-query-target.c~	Mon Jan 23 00:18:37 2006
-+++ libgda/gda-query-target.c	Sun Mar 26 10:03:52 2006
-@@ -732,8 +732,8 @@
- 	g_free (str);
- 	
- 	if (target->priv->entity_ref) {
--		str = NULL;
- 		GdaObject *base = gda_object_ref_get_ref_object (target->priv->entity_ref);
-+		str = NULL;
- 
- 		if (base) {
- 			str = gda_xml_storage_get_xml_id (GDA_XML_STORAGE (base));
diff --git a/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c b/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c
deleted file mode 100644
index de8c67a2e089..000000000000
--- a/databases/libgda3/files/patch-libgda_handlers_gda-handler-numerical.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- libgda/handlers/gda-handler-numerical.c~	Mon Jan 23 02:57:38 2006
-+++ libgda/handlers/gda-handler-numerical.c	Sun Mar 26 10:18:42 2006
-@@ -231,7 +231,7 @@
- 
- 	switch (type) {
- 	case GDA_VALUE_TYPE_BIGINT:
--		value = gda_value_new_bigint (atoll (str));
-+		value = gda_value_new_bigint (strtoll (str, (char **)NULL, 10));
- 		break;
- 	case GDA_VALUE_TYPE_DOUBLE:
- 		value = gda_value_new_double (atof (str));
diff --git a/databases/libgda3/files/patch-po_Makefile.in.in b/databases/libgda3/files/patch-po_Makefile.in.in
deleted file mode 100644
index 1e6984b6bbca..000000000000
--- a/databases/libgda3/files/patch-po_Makefile.in.in
+++ /dev/null
@@ -1,10 +0,0 @@
---- po/Makefile.in.in.orig	Sat Aug 14 00:43:46 2004
-+++ po/Makefile.in.in	Sat Aug 14 00:45:54 2004
-@@ -35,6 +35,7 @@
- 
- INSTALL = @INSTALL@
- INSTALL_DATA = @INSTALL_DATA@
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
- 
- CC = @CC@
- GENCAT = @GENCAT@
diff --git a/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c b/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c
deleted file mode 100644
index 58b766996f58..000000000000
--- a/databases/libgda3/files/patch-providers__mysql__gda-mysql-recordset.c
+++ /dev/null
@@ -1,28 +0,0 @@
---- providers/mysql/gda-mysql-recordset.c.orig	Thu Mar  2 22:28:54 2006
-+++ providers/mysql/gda-mysql-recordset.c	Sun Mar 26 10:20:02 2006
-@@ -141,7 +141,7 @@
- 		if (is_unsigned) {
- 			gda_value_set_biguint (gda_value, strtoull (value, NULL, 0));
- 		} else {
--			gda_value_set_bigint (gda_value, atoll (value));
-+			gda_value_set_bigint (gda_value, strtoll (value, (char **)NULL, 0));
- 		}
- 		break;
- 	case FIELD_TYPE_SHORT :
-@@ -584,6 +584,7 @@
- 	     colnum != gda_data_model_get_n_columns (GDA_DATA_MODEL(model));
- 	     colnum++)
- 	{
-+		gchar *curval;
- 		attrs = gda_data_model_describe_column (GDA_DATA_MODEL(model), colnum);
- 
- 		mysql_field = mysql_fetch_field_direct (priv_data->mysql_res, colnum);
-@@ -592,7 +593,7 @@
- 		else
- 			column_name = gda_data_model_get_column_title (GDA_DATA_MODEL (model), colnum);
- 
--		gchar *curval = gda_mysql_provider_value_to_sql_string (
-+		curval = gda_mysql_provider_value_to_sql_string (
- 				NULL, 	 
- 				priv_data->cnc, 	 
- 				gda_row_get_value ((GdaRow *) row, colnum) 	 
diff --git a/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c b/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c
deleted file mode 100644
index f51f91d03e79..000000000000
--- a/databases/libgda3/files/patch-providers_ibmdb2_gda-ibmdb2-types.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/ibmdb2/gda-ibmdb2-types.c~	Thu Jan 12 07:10:33 2006
-+++ providers/ibmdb2/gda-ibmdb2-types.c	Sun Mar 26 10:19:26 2006
-@@ -115,7 +115,7 @@
- 				gda_value_set_integer (value, *((gint*)field->column_data));
- 				break;
- 			case SQL_BIGINT:
--				gda_value_set_bigint (value, (gint64)atoll(field->column_data));
-+				gda_value_set_bigint (value, (gint64)strtoll(field->column_data, (char **)NULL, 10));
- 				break;
- 			case SQL_REAL:
- 				gda_value_set_single (value, *((gfloat*)field->column_data));
diff --git a/databases/libgda3/files/patch-providers_oracle_utils.c b/databases/libgda3/files/patch-providers_oracle_utils.c
deleted file mode 100644
index 46b894ce4907..000000000000
--- a/databases/libgda3/files/patch-providers_oracle_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/oracle/utils.c~	Wed Mar 15 07:25:51 2006
-+++ providers/oracle/utils.c	Sun Mar 26 10:20:18 2006
-@@ -415,7 +415,7 @@
- 		g_free (string_buffer);
- 		break;
- 	case GDA_VALUE_TYPE_BIGINT:
--		gda_value_set_bigint (value, atoll (ora_value->value));
-+		gda_value_set_bigint (value, strtoll (ora_value->value, (char **)NULL, 10));
- 		break;
- 	case GDA_VALUE_TYPE_INTEGER:
- 		gda_value_set_integer (value, atol (ora_value->value));
diff --git a/databases/libgda3/files/patch-providers_postgres_utils.c b/databases/libgda3/files/patch-providers_postgres_utils.c
deleted file mode 100644
index 29fe99b985b9..000000000000
--- a/databases/libgda3/files/patch-providers_postgres_utils.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- providers/postgres/utils.c.orig	Mon Feb 17 21:43:51 2003
-+++ providers/postgres/utils.c	Mon Feb 17 21:44:12 2003
-@@ -156,7 +156,7 @@
- 		gda_value_set_string (value, thevalue);
- 		break;
- 	case GDA_VALUE_TYPE_BIGINT :
--		gda_value_set_bigint (value, atoll (thevalue));
-+		gda_value_set_bigint (value, strtoll(thevalue, &thevalue, 10));
- 		break;
- 	case GDA_VALUE_TYPE_INTEGER :
- 		gda_value_set_integer (value, atol (thevalue));
diff --git a/databases/libgda3/files/patch-tools_gda-config-tool.c b/databases/libgda3/files/patch-tools_gda-config-tool.c
deleted file mode 100644
index 226aeeee7f3b..000000000000
--- a/databases/libgda3/files/patch-tools_gda-config-tool.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- tools/gda-config-tool.c.orig	Fri Jul 26 16:19:17 2002
-+++ tools/gda-config-tool.c	Fri Jul 26 16:18:47 2002
-@@ -1136,7 +1136,7 @@
- static char **
- completion_func (const gchar *text, int start, int end)
- {
--	return ((start == 0) ? rl_completion_matches (text, cmd_generator) :
-+	return ((start == 0) ? completion_matches (text, cmd_generator) :
- 				NULL);
- }
- 
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 5ef6181d8ff4..3f36856e096e 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -1,9 +1,13 @@
-bin/gda-config-tool
-bin/gda-report-test
-bin/gda-run
-bin/gda-test-delimiter
-etc/libgda/config
-etc/libgda/sales_test.db
+bin/gda-author-dict-file-%%VERSION%%
+bin/gda-config-tool-%%VERSION%%
+bin/gda-diagnose-%%VERSION%%
+bin/gda-inspect-dict-file-%%VERSION%%
+bin/gda-list-config-%%VERSION%%
+bin/gda-report-test-%%VERSION%%
+bin/gda-run-%%VERSION%%
+bin/gda-test-connection-%%VERSION%%
+etc/libgda-%%VERSION%%/config
+etc/libgda-%%VERSION%%/sales_test.db
 include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-item-detail.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-item-label.h
@@ -19,13 +23,14 @@ include/libgda-%%VERSION%%/libgda-report/gda-report-result.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-types.h
 include/libgda-%%VERSION%%/libgda-report/gda-report-valid.h
 include/libgda-%%VERSION%%/libgda-report/gda-report.h
-include/libgda-%%VERSION%%/libgda/gda-blob.h
+include/libgda-%%VERSION%%/libgda/gda-blob-op.h
 include/libgda-%%VERSION%%/libgda/gda-client.h
 include/libgda-%%VERSION%%/libgda/gda-column-index.h
 include/libgda-%%VERSION%%/libgda/gda-column.h
 include/libgda-%%VERSION%%/libgda/gda-command.h
 include/libgda-%%VERSION%%/libgda/gda-config.h
 include/libgda-%%VERSION%%/libgda/gda-connection-event.h
+include/libgda-%%VERSION%%/libgda/gda-connection-private.h
 include/libgda-%%VERSION%%/libgda/gda-connection.h
 include/libgda-%%VERSION%%/libgda/gda-data-access-wrapper.h
 include/libgda-%%VERSION%%/libgda/gda-data-handler.h
@@ -47,6 +52,11 @@ include/libgda-%%VERSION%%/libgda/gda-dict-constraint.h
 include/libgda-%%VERSION%%/libgda/gda-dict-database.h
 include/libgda-%%VERSION%%/libgda/gda-dict-field.h
 include/libgda-%%VERSION%%/libgda/gda-dict-function.h
+include/libgda-%%VERSION%%/libgda/gda-dict-private.h
+include/libgda-%%VERSION%%/libgda/gda-dict-reg-aggregates.h
+include/libgda-%%VERSION%%/libgda/gda-dict-reg-functions.h
+include/libgda-%%VERSION%%/libgda/gda-dict-reg-queries.h
+include/libgda-%%VERSION%%/libgda/gda-dict-reg-types.h
 include/libgda-%%VERSION%%/libgda/gda-dict-table.h
 include/libgda-%%VERSION%%/libgda/gda-dict-type.h
 include/libgda-%%VERSION%%/libgda/gda-dict.h
@@ -60,6 +70,7 @@ include/libgda-%%VERSION%%/libgda/gda-marshal.h
 include/libgda-%%VERSION%%/libgda/gda-object-ref.h
 include/libgda-%%VERSION%%/libgda/gda-object.h
 include/libgda-%%VERSION%%/libgda/gda-parameter-list.h
+include/libgda-%%VERSION%%/libgda/gda-parameter-util.h
 include/libgda-%%VERSION%%/libgda/gda-parameter.h
 include/libgda-%%VERSION%%/libgda/gda-quark-list.h
 include/libgda-%%VERSION%%/libgda/gda-query-condition.h
@@ -78,14 +89,17 @@ include/libgda-%%VERSION%%/libgda/gda-query.h
 include/libgda-%%VERSION%%/libgda/gda-referer.h
 include/libgda-%%VERSION%%/libgda/gda-renderer.h
 include/libgda-%%VERSION%%/libgda/gda-row.h
+include/libgda-%%VERSION%%/libgda/gda-server-operation.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider-extra.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider-private.h
 include/libgda-%%VERSION%%/libgda/gda-server-provider.h
 include/libgda-%%VERSION%%/libgda/gda-threader.h
-include/libgda-%%VERSION%%/libgda/gda-transaction.h
+include/libgda-%%VERSION%%/libgda/gda-transaction-status-private.h
+include/libgda-%%VERSION%%/libgda/gda-transaction-status.h
 include/libgda-%%VERSION%%/libgda/gda-util.h
 include/libgda-%%VERSION%%/libgda/gda-value.h
 include/libgda-%%VERSION%%/libgda/gda-xml-storage.h
+include/libgda-%%VERSION%%/libgda/graph/gda-dict-reg-graphs.h
 include/libgda-%%VERSION%%/libgda/graph/gda-graph-item.h
 include/libgda-%%VERSION%%/libgda/graph/gda-graph-query.h
 include/libgda-%%VERSION%%/libgda/graph/gda-graph.h
@@ -98,128 +112,101 @@ include/libgda-%%VERSION%%/libgda/handlers/gda-handler-type.h
 include/libgda-%%VERSION%%/libgda/libgda.h
 include/libgda-%%VERSION%%/libsql/sql_parser.h
 include/libgda-%%VERSION%%/sql-delimiter/gda-sql-delimiter.h
-lib/libgda-3.a
-lib/libgda-3.la
-lib/libgda-3.so
-lib/libgda-3.so.3
-lib/libgda-report-3.a
-lib/libgda-report-3.la
-lib/libgda-report-3.so
-lib/libgda-report-3.so.3
-lib/libgda_graph-3.a
-lib/libgda_graph-3.la
-lib/libgda_graph-3.so
-lib/libgda_graph-3.so.3
-lib/libgda_handlers-3.a
-lib/libgda_handlers-3.la
-lib/libgda_handlers-3.so
-lib/libgda_handlers-3.so.3
-lib/libgda_sql_delimiter-3.a
-lib/libgda_sql_delimiter-3.la
-lib/libgda_sql_delimiter-3.so
-lib/libgda_sql_delimiter-3.so.3
-lib/libgdasql.a
-lib/libgdasql.la
-lib/libgdasql.so
-lib/libgdasql.so.3
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.a
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.la
-%%FIREBIRD:%%lib/libgda-%%VERSION%%/providers/libgda-firebird.so
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.a
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.la
-%%FREETDS:%%lib/libgda-%%VERSION%%/providers/libgda-freetds.so
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.a
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.la
-%%LDAP:%%lib/libgda-%%VERSION%%/providers/libgda-ldap.so
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.a
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.la
-%%MDB:%%lib/libgda-%%VERSION%%/providers/libgda-mdb.so
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.a
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.la
-%%MYSQL:%%lib/libgda-%%VERSION%%/providers/libgda-mysql.so
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.a
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.la
-%%ODBC:%%lib/libgda-%%VERSION%%/providers/libgda-odbc.so
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.a
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.la
-%%POSTGRES:%%lib/libgda-%%VERSION%%/providers/libgda-postgres.so
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.a
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.la
-%%SYBASE:%%lib/libgda-%%VERSION%%/providers/libgda-sybase.so
+lib/libgda-%%VERSION%%.a
+lib/libgda-%%VERSION%%.la
+lib/libgda-%%VERSION%%.so
+lib/libgda-%%VERSION%%.so.3
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
 lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
-libdata/pkgconfig/libgda-2.0.pc
-share/libgda/dtd/libgda-array.dtd
-share/libgda/dtd/libgda-dict.dtd
-%%MYSQL:%%share/libgda/mysql_specs_create_db.xml
-%%MYSQL:%%share/libgda/mysql_specs_dsn.xml
-%%POSTGRES:%%share/libgda/postgres_specs_create_db.xml
-%%POSTGRES:%%share/libgda/postgres_specs_dsn.xml
-share/libgda/sqlite_specs_create_db.xml
-share/libgda/sqlite_specs_dsn.xml
-share/libgda/xml/gda-report.dtd
-share/libgda/xml/gda-report-result.dtd
-share/libgda/xml/gda-xml-query.dtd
-share/libgda/xml/gda-xml-query.xsl
-share/locale/az/LC_MESSAGES/libgda-3.mo
-share/locale/ca/LC_MESSAGES/libgda-3.mo
-share/locale/cs/LC_MESSAGES/libgda-3.mo
-share/locale/da/LC_MESSAGES/libgda-3.mo
-share/locale/de/LC_MESSAGES/libgda-3.mo
-share/locale/el/LC_MESSAGES/libgda-3.mo
-share/locale/en_CA/LC_MESSAGES/libgda-3.mo
-share/locale/en_GB/LC_MESSAGES/libgda-3.mo
-share/locale/es/LC_MESSAGES/libgda-3.mo
-share/locale/eu/LC_MESSAGES/libgda-3.mo
-share/locale/fa/LC_MESSAGES/libgda-3.mo
-share/locale/fi/LC_MESSAGES/libgda-3.mo
-share/locale/fr/LC_MESSAGES/libgda-3.mo
-share/locale/ga/LC_MESSAGES/libgda-3.mo
-share/locale/gl/LC_MESSAGES/libgda-3.mo
-share/locale/hr/LC_MESSAGES/libgda-3.mo
-share/locale/hu/LC_MESSAGES/libgda-3.mo
-share/locale/it/LC_MESSAGES/libgda-3.mo
-share/locale/ja/LC_MESSAGES/libgda-3.mo
-share/locale/ko/LC_MESSAGES/libgda-3.mo
-share/locale/ml/LC_MESSAGES/libgda-3.mo
-share/locale/ms/LC_MESSAGES/libgda-3.mo
-share/locale/nb/LC_MESSAGES/libgda-3.mo
-share/locale/ne/LC_MESSAGES/libgda-3.mo
-share/locale/nl/LC_MESSAGES/libgda-3.mo
-share/locale/no/LC_MESSAGES/libgda-3.mo
-share/locale/pl/LC_MESSAGES/libgda-3.mo
-share/locale/pt/LC_MESSAGES/libgda-3.mo
-share/locale/pt_BR/LC_MESSAGES/libgda-3.mo
-share/locale/ru/LC_MESSAGES/libgda-3.mo
-share/locale/rw/LC_MESSAGES/libgda-3.mo
-share/locale/sk/LC_MESSAGES/libgda-3.mo
-share/locale/sl/LC_MESSAGES/libgda-3.mo
-share/locale/sq/LC_MESSAGES/libgda-3.mo
-share/locale/sr/LC_MESSAGES/libgda-3.mo
-share/locale/sr@Latn/LC_MESSAGES/libgda-3.mo
-share/locale/sv/LC_MESSAGES/libgda-3.mo
-share/locale/tr/LC_MESSAGES/libgda-3.mo
-share/locale/uk/LC_MESSAGES/libgda-3.mo
-share/locale/vi/LC_MESSAGES/libgda-3.mo
-share/locale/zh_CN/LC_MESSAGES/libgda-3.mo
-share/locale/zh_HK/LC_MESSAGES/libgda-3.mo
-share/locale/zh_TW/LC_MESSAGES/libgda-3.mo
-@dirrm share/libgda/xml
-@dirrm share/libgda/dtd
-@dirrm share/libgda
+lib/libgda-report-%%VERSION%%.a
+lib/libgda-report-%%VERSION%%.la
+lib/libgda-report-%%VERSION%%.so
+lib/libgda-report-%%VERSION%%.so.3
+lib/libgdasql-%%VERSION%%.a
+lib/libgdasql-%%VERSION%%.la
+lib/libgdasql-%%VERSION%%.so
+lib/libgdasql-%%VERSION%%.so.3
+libdata/pkgconfig/libgda-%%VERSION%%.pc
+libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
+share/libgda-%%VERSION%%/dtd/libgda-array.dtd
+share/libgda-%%VERSION%%/dtd/libgda-dict.dtd
+share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
+share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
+share/libgda-%%VERSION%%/sqlite_specs_add_column.xml
+share/libgda-%%VERSION%%/sqlite_specs_create_db.xml
+share/libgda-%%VERSION%%/sqlite_specs_create_index.xml
+share/libgda-%%VERSION%%/sqlite_specs_create_table.xml
+share/libgda-%%VERSION%%/sqlite_specs_drop_db.xml
+share/libgda-%%VERSION%%/sqlite_specs_drop_index.xml
+share/libgda-%%VERSION%%/sqlite_specs_drop_table.xml
+share/libgda-%%VERSION%%/sqlite_specs_dsn.xml
+share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml
+share/libgda-%%VERSION%%/xml/gda-report-result.dtd
+share/libgda-%%VERSION%%/xml/gda-report.dtd
+share/libgda-%%VERSION%%/xml/gda-xml-query.dtd
+share/libgda-%%VERSION%%/xml/gda-xml-query.xsl
+share/locale/ar/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/az/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ca/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/cs/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/da/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/de/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/dz/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/el/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/en_CA/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/en_GB/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/es/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/eu/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/fa/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/fi/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/fr/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ga/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/gl/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/hr/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/hu/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/it/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ja/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ko/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/lt/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ml/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ms/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/nb/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ne/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/nl/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/pl/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/pt/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/pt_BR/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/ru/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/rw/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sk/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sl/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sq/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sr/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sr@Latn/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/sv/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/tr/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/uk/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/vi/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/zh_CN/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/zh_HK/LC_MESSAGES/libgda-%%VERSION%%.mo
+share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
+@dirrm share/libgda-%%VERSION%%/xml
+@dirrm share/libgda-%%VERSION%%/dtd
+@dirrm share/libgda-%%VERSION%%/
 @dirrm lib/libgda-%%VERSION%%/providers
 @dirrm lib/libgda-%%VERSION%%
-@dirrm lib/libgda
 @dirrm include/libgda-%%VERSION%%/sql-delimiter
 @dirrm include/libgda-%%VERSION%%/libsql
-@dirrm include/libgda-%%VERSION%%/libgda-report
 @dirrm include/libgda-%%VERSION%%/libgda/handlers
 @dirrm include/libgda-%%VERSION%%/libgda/graph
 @dirrm include/libgda-%%VERSION%%/libgda
+@dirrm include/libgda-%%VERSION%%/libgda-report
 @dirrm include/libgda-%%VERSION%%
-@dirrm etc/libgda
+@comment lib/libgda-%%VERSION%%/providers/
 @dirrmtry share/locale/zh_HK/LC_MESSAGES
 @dirrmtry share/locale/zh_HK
 @dirrmtry share/locale/rw/LC_MESSAGES
 @dirrmtry share/locale/rw
+@dirrmtry share/locale/dz/LC_MESSAGES
+@dirrmtry share/locale/dz