Update to 1.9.100 (gnumeric needs >=1.3, and we have no other

relevant dependencies).

Remove libda-sqlite, since it's included in libgda by default.

libgda 1.9.100, 2005-10-13
--------------------------

 - Fixed #317267 (Rodrigo)
 - GdaRow API improvements (Vivien)
 - GdaColumn API improvements (Vivien)
 - Limit usage of SQLite internal structures (Vivien)
 - Removed usage of C++ 'new' keyboard as argument (Bas)
 - Added missing declarations to gda-column.h (Vivien)

libgda 1.9.99, 2005-09-26
-------------------------

 - Added Mono bindings from GTK# (Dan)
 - Convert SQLstate to GDA error code in PostgreSQL provider (Juan Manuel)
 - Don't use scrollkeeper for API docs (Rodrigo)
 - Improved data types in SQLite provider (Vivien)
 - API fixes (Vivien, Murray)
 - Removed unfinished, non-working objects (Vivien)
 - Blob object fixes (Vivien)
 - Blob improvements in PostgreSQL provider (Vivien)
 - Improved test to locate MDB libraries (Vivien)
 - Added "gda_type_changed" signal to GdaColumn (Vivien)
 - Updated translations:
        - eu (Iñaki)
        - ne (Pawan)
	- vi (Clytie)

libgda 1.3.91, 2005-08-10
-------------------------

 - Compilation fixes for 64bit platforms (Rodrigo)
 - Fixed call to undefined symbol in XML provider (Rodrigo)

libgda 1.3.90, 2005-08-07
-------------------------

 - Port GdaValue to use GValue (Daniel, Vivien)
 - Disabled useless test in Firebird provider (Juan Manuel)
 - GCC 4 compilation fixes (Christopher)
 - Fixed #311573 (Rodrigo)
 - GdaClient/GdaConnection API improvements (Vivien)
 - Renamed GdaError to GdaConnectionEvent, to be used not only for errors,
   but for any DB event (Vivien, Juan Manuel)
 - Improved PostgreSQL/SQLite/MySQL error reporting (Vivien, Juan Manuel)
 - Update to SQLite3 API (Vivien)
 - Added get_specs method to GdaServerProvider, to get information on
   arguments for actions (Vivien)
 - Fixed PostgreSQL libraries detection (Vivien)
 - Fixed NUMERIC values passing in Oracle provider (Vivien)
 - Updated translations:
        - vi (Clytie)

libgda 1.3.4, 2005-07-08
------------------------

 - Fixed leak in PostgreSQL provider (Alex)
 - Use libgda-2.0 for the pkg-config files (Rodrigo)
 - Fixed #307549 (Rodrigo)
 - Fixed installation on 64 bit platforms (Bas)
 - Allow compilation with Berkeley DB > 4.3.x (Bas)
 - Fixed 64 bit problems on MySQL/PostgreSQL and SQLite providers (Bas)
 - Fixed return values on some invalid functions (Stanislav)
 - Building fixes (Stanislav)
 - Fixed invalid free in MySQL recordsets (Rodrigo)
 - Some fixes in global config file saving (Vivien)
 - More API documentation (Vivien)
 - Use GType for all types, not guint (Vivien)
 - Tables' fields schema fixes (Vivien)
 - Fix #309332 (Murray)
 - Updated translations:
        - de (Hendrik)

libgda 1.3.3, 2005-06-06
------------------------

 - New API additions (Vivien)
 - Added get_specs_create_database and create_database_params virtual methods
   for providers (Vivien)
 - Updated API documentation (Vivien)
 - Implemented new providers' methods for SQLite, PostgreSQL and MySQL (Vivien)
 - Build fixes (Rodrigo)

libgda 1.3.2, 2005-05-27
------------------------

 - Prevent segfault when running INSERT of UPDATE queries in MySQL provider (Alan)
 - Improved update of PostgreSQL data models (Bas)
 - Improved exporting of data models (Vivien)
 - Added GdaThreader object to make it easy to run threaded operations (Vivien)
 - Implemented missing schemas in SQLite provider (Vivien)
 - Fixed GdaXqlUpdate API typo (Murray)
 - Improved fields schema for PostgreSQL provider (Vivien)
 - Added procedures schema to MySQL provider (Vivien)
 - Fixed MySQL value conversion to string (Alan)
 - Compilation fixes (Dru, Bas, Rodrigo)
 - Added functions to dump data models (Vivien)
 - Improved data types schema in MySQL provider (Vivien)
 - Added synonyms to the data types schema (Vivien)
 - API documentation (Dru)
 - Fixed typo in GdaExport signal creation (Mike Kestner)
 - Changed procedures schema to include more information (Vivien)
 - Added creation of ~/.libgda directory when it does not exist (Vivien)
 - Fixed #153292 (Jorge)
 - Fixed #301480 (Magnus)
 - Fixed #301485 (Magnus)
 - Fixed #302158 (Jean)
 - Fixed #304586 (Mike Fisk)
 - Updated translations:
        - es (Jorge)
	- it (Marco)
	- rw (Steve)
        - uk (Maxim)
        - zw (Steve)

libgda 1.3.1, 2005-03-21
------------------------

 - Improved GdaRow API (Vivien)
 - Fixed #167573 (Rodrigo)
 - Added gda_xml_database_remove_table function (Álvaro)
 - Fixed libsql build (Rodrigo)
 - Upgraded SQLite provider to SQLite3 (Denis)
 - Install providers in versioned directories for parallel installation (Rodrigo)
 - Use libgda*-3 as library names (Rodrigo)
 - Fixed #129153 (Rodrigo)
 - Renamed GdaDataModelColumnAttributes to GdaColumn (Álvaro)
 - Renamed GdaDataModelColumnIndexAttributes to GdaColumnAttributes (Álvaro)
 - Code cleanup for data model classes (Bas)
 - Cleanup auto* build noise (Bas)
 - Replace gda_connection_escape_string with more generic
   gda_connection_value_to_sql_string (Alan)
 - Updated translations:
        - cs (Miroslav)
        - de (Frank)
        - en_CA (Adam)
        - en_GB (David)
        - it (Marco)
	- pt (Duarte)
	- pt_BR (Raphael)

libgda 1.3.0, 2005-02-07
------------------------

 - Fixed spec includedir (Aaron)
 - Set missing row number on gda_data_model_hash_append_row (Bas)
 - Changed GdaDataModel class to be an interface (Vivien)
 - Data model improvements (Vivien, Bas, Álvaro)
 - Renamed GdaField to GdaColumn (Vivien)
 - Improved documentation (Vivien, Bas)
 - Added full update/remove for MySQL and PostgreSQL data models (Bas)
 - Fixed build (Rodrigo)
 - Added methods for creating/droping tables and indices (Bas)
 - Updated translations:
        - cs (Miroslav)
	- de (Frank)
        - en_CA (Adam)
        - es (Francisco)
	- it (Marco)
	- nl (Vincent)
	- pt_BR (Raphael)

13 files changed, 206 insertions, 234 deletions

diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 4f1887b9ee7..73d5cb1d6f7 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.16 2006/01/24 07:31:59 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/02/04 17:02:45 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=	2
-
-PKGCONFIG_OVERRIDE=	libgda.pc.in
+PKGCONFIG_OVERRIDE=	libgda-2.0.pc.in
 
 PKG_SYSCONFSUBDIR=	libgda
 EGDIR=			${PREFIX}/share/examples/libgda
@@ -13,5 +11,7 @@ CONF_FILES+=		${EGDIR}/config ${PKG_SYSCONFDIR}/config
 
 CONFIGURE_ARGS+=	--with-odbc=no --with-bdb=no
 
-.include "../../textproc/scrollkeeper/omf.mk"
+post-install:
+	${RMDIR} ${PREFIX}/lib/libgda
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 8332f485d74..7dad0776b4d 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile.common,v 1.36 2005/12/29 06:21:35 jlam Exp $
+# $NetBSD: Makefile.common,v 1.37 2006/02/04 17:02:45 wiz Exp $
 #
 
-DISTNAME=		libgda-1.2.2
+DISTNAME=		libgda-1.9.100
 CATEGORIES=		databases gnome
-MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.2/}
+MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.9/}
 EXTRACT_SUFX=		.tar.bz2
 
 MAINTAINER=		tech-pkg@NetBSD.org
@@ -20,7 +20,7 @@ GNU_CONFIGURE=		YES
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR:Q}
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
-CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc"
+CONFIGURE_ARGS+=	--with-html-dir=${PREFIX:Q}/share/doc
 CONFIGURE_ARGS+=	--without-ldap
 CONFIGURE_ARGS+=	--without-mysql
 
@@ -28,12 +28,11 @@ CONFIGURE_ARGS+=	--without-mysql
 PKGNAME=		${DISTNAME:S/libgda-/libgda-${LIBGDA_PROVIDER}-/}
 COMMENT+=		- ${LIBGDA_PROVIDER} provider
 
-BUILD_DIRS=		${WRKSRC}/providers/${LIBGDA_PROVIDER}
-INSTALL_DIRS=		${WRKSRC}/providers/${LIBGDA_PROVIDER}
+BUILD_DIRS=		providers/${LIBGDA_PROVIDER}
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
-SUBST_MESSAGE.libs=	"Fixing references to installed libraries."
+SUBST_MESSAGE.libs=	Fixing references to installed libraries.
 SUBST_FILES.libs=	providers/${LIBGDA_PROVIDER}/Makefile.in
 SUBST_SED.libs+=	-e 's|$$(top_builddir)/libgda/libgda-2.la|${BUILDLINK_PREFIX.libgda}/lib/libgda-2.la|'
 
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index 5bdab54c089..bbe1924497a 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,76 +1,67 @@
-@comment $NetBSD: PLIST,v 1.12 2005/06/26 16:54:07 jmmv Exp $
+@comment $NetBSD: PLIST,v 1.13 2006/02/04 17:02:45 wiz Exp $
 bin/gda-report-test
 bin/gda-run
 bin/gda-test
-include/libgda-1.2/libgda-report/gda-report-document.h
-include/libgda-1.2/libgda-report/gda-report-item-detail.h
-include/libgda-1.2/libgda-report/gda-report-item-label.h
-include/libgda-1.2/libgda-report/gda-report-item-pagefooter.h
-include/libgda-1.2/libgda-report/gda-report-item-pageheader.h
-include/libgda-1.2/libgda-report/gda-report-item-repfield.h
-include/libgda-1.2/libgda-report/gda-report-item-report.h
-include/libgda-1.2/libgda-report/gda-report-item-reportfooter.h
-include/libgda-1.2/libgda-report/gda-report-item-reportheader.h
-include/libgda-1.2/libgda-report/gda-report-item-sqlquery.h
-include/libgda-1.2/libgda-report/gda-report-item.h
-include/libgda-1.2/libgda-report/gda-report-result.h
-include/libgda-1.2/libgda-report/gda-report-types.h
-include/libgda-1.2/libgda-report/gda-report-valid.h
-include/libgda-1.2/libgda-report/gda-report.h
-include/libgda-1.2/libgda/gda-blob.h
-include/libgda-1.2/libgda/gda-client.h
-include/libgda-1.2/libgda/gda-command.h
-include/libgda-1.2/libgda/gda-config.h
-include/libgda-1.2/libgda/gda-connection.h
-include/libgda-1.2/libgda/gda-data-model-array.h
-include/libgda-1.2/libgda/gda-data-model-hash.h
-include/libgda-1.2/libgda/gda-data-model-list.h
-include/libgda-1.2/libgda/gda-data-model.h
-include/libgda-1.2/libgda/gda-enum-types.h
-include/libgda-1.2/libgda/gda-error.h
-include/libgda-1.2/libgda/gda-field.h
-include/libgda-1.2/libgda/gda-log.h
-include/libgda-1.2/libgda/gda-marshal.h
-include/libgda-1.2/libgda/gda-parameter.h
-include/libgda-1.2/libgda/gda-quark-list.h
-include/libgda-1.2/libgda/gda-row.h
-include/libgda-1.2/libgda/gda-select.h
-include/libgda-1.2/libgda/gda-server-provider.h
-include/libgda-1.2/libgda/gda-table.h
-include/libgda-1.2/libgda/gda-transaction.h
-include/libgda-1.2/libgda/gda-util.h
-include/libgda-1.2/libgda/gda-value.h
-include/libgda-1.2/libgda/gda-xml-connection.h
-include/libgda-1.2/libgda/gda-xml-database.h
-include/libgda-1.2/libgda/gda-xml-document.h
-include/libgda-1.2/libgda/gda-xql-atom.h
-include/libgda-1.2/libgda/gda-xql-bin.h
-include/libgda-1.2/libgda/gda-xql-column.h
-include/libgda-1.2/libgda/gda-xql-const.h
-include/libgda-1.2/libgda/gda-xql-delete.h
-include/libgda-1.2/libgda/gda-xql-dml.h
-include/libgda-1.2/libgda/gda-xql-dual.h
-include/libgda-1.2/libgda/gda-xql-field.h
-include/libgda-1.2/libgda/gda-xql-func.h
-include/libgda-1.2/libgda/gda-xql-insert.h
-include/libgda-1.2/libgda/gda-xql-item.h
-include/libgda-1.2/libgda/gda-xql-join.h
-include/libgda-1.2/libgda/gda-xql-list.h
-include/libgda-1.2/libgda/gda-xql-query.h
-include/libgda-1.2/libgda/gda-xql-select.h
-include/libgda-1.2/libgda/gda-xql-stack.h
-include/libgda-1.2/libgda/gda-xql-target.h
-include/libgda-1.2/libgda/gda-xql-update.h
-include/libgda-1.2/libgda/gda-xql-utils.h
-include/libgda-1.2/libgda/gda-xql-value.h
-include/libgda-1.2/libgda/gda-xql-valueref.h
-include/libgda-1.2/libgda/libgda.h
-include/libgda-1.2/sql/sql_parser.h
-lib/libgda-2.la
-lib/libgda-report-2.la
-lib/libgda/providers/libgda-xml.la
+include/libgda-1.9/libgda-report/gda-report-document.h
+include/libgda-1.9/libgda-report/gda-report-item-detail.h
+include/libgda-1.9/libgda-report/gda-report-item-label.h
+include/libgda-1.9/libgda-report/gda-report-item-pagefooter.h
+include/libgda-1.9/libgda-report/gda-report-item-pageheader.h
+include/libgda-1.9/libgda-report/gda-report-item-repfield.h
+include/libgda-1.9/libgda-report/gda-report-item-report.h
+include/libgda-1.9/libgda-report/gda-report-item-reportfooter.h
+include/libgda-1.9/libgda-report/gda-report-item-reportheader.h
+include/libgda-1.9/libgda-report/gda-report-item-sqlquery.h
+include/libgda-1.9/libgda-report/gda-report-item.h
+include/libgda-1.9/libgda-report/gda-report-result.h
+include/libgda-1.9/libgda-report/gda-report-types.h
+include/libgda-1.9/libgda-report/gda-report-valid.h
+include/libgda-1.9/libgda-report/gda-report.h
+include/libgda-1.9/libgda/gda-blob.h
+include/libgda-1.9/libgda/gda-client.h
+include/libgda-1.9/libgda/gda-column-index.h
+include/libgda-1.9/libgda/gda-column.h
+include/libgda-1.9/libgda/gda-command.h
+include/libgda-1.9/libgda/gda-config.h
+include/libgda-1.9/libgda/gda-connection-event.h
+include/libgda-1.9/libgda/gda-connection.h
+include/libgda-1.9/libgda/gda-data-model-array.h
+include/libgda-1.9/libgda/gda-data-model-base.h
+include/libgda-1.9/libgda/gda-data-model-hash.h
+include/libgda-1.9/libgda/gda-data-model-index.h
+include/libgda-1.9/libgda/gda-data-model-list.h
+include/libgda-1.9/libgda/gda-data-model.h
+include/libgda-1.9/libgda/gda-enum-types.h
+include/libgda-1.9/libgda/gda-log.h
+include/libgda-1.9/libgda/gda-marshal.h
+include/libgda-1.9/libgda/gda-parameter.h
+include/libgda-1.9/libgda/gda-quark-list.h
+include/libgda-1.9/libgda/gda-row.h
+include/libgda-1.9/libgda/gda-select.h
+include/libgda-1.9/libgda/gda-server-provider.h
+include/libgda-1.9/libgda/gda-threader.h
+include/libgda-1.9/libgda/gda-transaction.h
+include/libgda-1.9/libgda/gda-util.h
+include/libgda-1.9/libgda/gda-value.h
+include/libgda-1.9/libgda/global-decl.h
+include/libgda-1.9/libgda/libgda.h
+include/libgda-1.9/sql/sql_parser.h
+lib/libgda-1.9/providers/libgda-sqlite.la
+lib/libgda-3.la
+lib/libgda-report-3.la
 lib/libgdasql.la
-lib/pkgconfig/libgda.pc
+lib/pkgconfig/libgda-2.0.pc
+share/doc/libgda/GdaClient.html
+share/doc/libgda/GdaColumn.html
+share/doc/libgda/GdaColumnIndex.html
+share/doc/libgda/GdaDataModel.html
+share/doc/libgda/GdaDataModelArray.html
+share/doc/libgda/GdaDataModelHash.html
+share/doc/libgda/GdaDataModelList.html
+share/doc/libgda/GdaRow.html
+share/doc/libgda/GdaSelect.html
+share/doc/libgda/GdaServerProvider.html
+share/doc/libgda/GdaTransaction.html
 share/doc/libgda/architecture.html
 share/doc/libgda/ch06.html
 share/doc/libgda/ch09s04.html
@@ -99,15 +90,14 @@ share/doc/libgda/installation-configuring.html
 share/doc/libgda/installation-installing.html
 share/doc/libgda/installation.html
 share/doc/libgda/introduction.html
+share/doc/libgda/ix01.html
 share/doc/libgda/left.png
-share/doc/libgda/libgda-GdaClient.html
+share/doc/libgda/libgda-BLOBs.html
+share/doc/libgda/libgda-Commands.html
 share/doc/libgda/libgda-GdaConnection.html
-share/doc/libgda/libgda-GdaDataModel.html
-share/doc/libgda/libgda-GdaDataModelArray.html
-share/doc/libgda/libgda-GdaDataModelHash.html
-share/doc/libgda/libgda-GdaDataModelList.html
-share/doc/libgda/libgda-GdaError.html
-share/doc/libgda/libgda-GdaExport.html
+share/doc/libgda/libgda-GdaConnectionEvent.html
+share/doc/libgda/libgda-GdaDataModelIndex.html
+share/doc/libgda/libgda-GdaParameter.html
 share/doc/libgda/libgda-GdaReportDocument.html
 share/doc/libgda/libgda-GdaReportItem.html
 share/doc/libgda/libgda-GdaReportItemDetail.html
@@ -121,53 +111,19 @@ share/doc/libgda/libgda-GdaReportItemReportHeader.html
 share/doc/libgda/libgda-GdaReportItemSqlQuery.html
 share/doc/libgda/libgda-GdaReportResult.html
 share/doc/libgda/libgda-GdaReportValid.html
-share/doc/libgda/libgda-GdaSelect.html
-share/doc/libgda/libgda-GdaServerProvider.html
-share/doc/libgda/libgda-GdaTable.html
-share/doc/libgda/libgda-GdaTransaction.html
-share/doc/libgda/libgda-GdaXmlConnection.html
-share/doc/libgda/libgda-GdaXmlDatabase.html
-share/doc/libgda/libgda-GdaXmlDocument.html
-share/doc/libgda/libgda-GdaXqlAtom.html
-share/doc/libgda/libgda-GdaXqlBin.html
-share/doc/libgda/libgda-GdaXqlColumn.html
-share/doc/libgda/libgda-GdaXqlConst.html
-share/doc/libgda/libgda-GdaXqlDelete.html
-share/doc/libgda/libgda-GdaXqlDml.html
-share/doc/libgda/libgda-GdaXqlDual.html
-share/doc/libgda/libgda-GdaXqlField.html
-share/doc/libgda/libgda-GdaXqlFunc.html
-share/doc/libgda/libgda-GdaXqlInsert.html
-share/doc/libgda/libgda-GdaXqlItem.html
-share/doc/libgda/libgda-GdaXqlJoin.html
-share/doc/libgda/libgda-GdaXqlList.html
-share/doc/libgda/libgda-GdaXqlQuery.html
-share/doc/libgda/libgda-GdaXqlSelect.html
-share/doc/libgda/libgda-GdaXqlStack.html
-share/doc/libgda/libgda-GdaXqlTarget.html
-share/doc/libgda/libgda-GdaXqlUpdate.html
-share/doc/libgda/libgda-GdaXqlValue.html
-share/doc/libgda/libgda-GdaXqlValueRef.html
+share/doc/libgda/libgda-GdaValue.html
+share/doc/libgda/libgda-Libgda-Initialization.html
+share/doc/libgda/libgda-Logging.html
+share/doc/libgda/libgda-Quark-lists.html
+share/doc/libgda/libgda-Utility-functions.html
 share/doc/libgda/libgda-api.html
-share/doc/libgda/libgda-gda-blob.html
-share/doc/libgda/libgda-gda-command.html
 share/doc/libgda/libgda-gda-config.html
-share/doc/libgda/libgda-gda-field.html
-share/doc/libgda/libgda-gda-log.html
-share/doc/libgda/libgda-gda-parameter.html
-share/doc/libgda/libgda-gda-quark-list.html
+share/doc/libgda/libgda-gda-data-model-base.html
 share/doc/libgda/libgda-gda-report-types.html
-share/doc/libgda/libgda-gda-row.html
-share/doc/libgda/libgda-gda-util.html
-share/doc/libgda/libgda-gda-value.html
-share/doc/libgda/libgda-gda-xql-utils.html
-share/doc/libgda/libgda-libgda.html
 share/doc/libgda/libgda-provider-class.html
 share/doc/libgda/libgda-provider-recordset.html
 share/doc/libgda/libgda-providers.html
 share/doc/libgda/libgda-reports.html
-share/doc/libgda/libgda-server-provider-details.html
-share/doc/libgda/libgda-xql.html
 share/doc/libgda/libgda.devhelp
 share/doc/libgda/main_example.html
 share/doc/libgda/manage-gdavalue.html
@@ -179,58 +135,63 @@ share/doc/libgda/processing-queries.html
 share/doc/libgda/right.png
 share/doc/libgda/style.css
 share/doc/libgda/up.png
+share/examples/libgda/config
+share/examples/libgda/sales_test.db
+share/libgda/sqlite_specs_create_db.xml
+share/libgda/sqlite_specs_dsn.xml
 share/libgda/xml/gda-report-result.dtd
 share/libgda/xml/gda-report.dtd
 share/libgda/xml/gda-xml-query.dtd
 share/libgda/xml/gda-xml-query.xsl
-${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgda-2.mo
-${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgda-2.mo
-share/omf/libgda/libgda-C.omf
-@dirrm share/omf/libgda
-@comment in scrollkeeper: @dirrm share/omf
+${PKGLOCALEDIR}/locale/az/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ca/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/el/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/en_CA/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/en_GB/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/eu/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/fa/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/fi/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ga/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/gl/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/hr/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/hu/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ko/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ml/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ms/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/nb/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ne/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/nl/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/pl/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/pt/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/pt_BR/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/rw/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sk/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sq/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sr/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sr@Latn/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/tr/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/vi/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgda-3.mo
+${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgda-3.mo
 @dirrm share/libgda/xml
 @dirrm share/libgda
+@dirrm share/examples/libgda
 @dirrm share/doc/libgda
-@dirrm lib/libgda/providers
-@dirrm lib/libgda
-@dirrm include/libgda-1.2/sql
-@dirrm include/libgda-1.2/libgda-report
-@dirrm include/libgda-1.2/libgda
-@dirrm include/libgda-1.2
+@dirrm lib/libgda-1.9/providers
+@dirrm lib/libgda-1.9
+@dirrm include/libgda-1.9/sql
+@dirrm include/libgda-1.9/libgda-report
+@dirrm include/libgda-1.9/libgda
+@dirrm include/libgda-1.9
diff --git a/databases/libgda/buildlink3.mk b/databases/libgda/buildlink3.mk
index 5cd042d477e..3c3efd4b636 100644
--- a/databases/libgda/buildlink3.mk
+++ b/databases/libgda/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.7 2006/01/24 07:31:59 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.8 2006/02/04 17:02:45 wiz Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 LIBGDA_BUILDLINK3_MK:=	${LIBGDA_BUILDLINK3_MK}+
@@ -11,11 +11,12 @@ BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibgda}
 BUILDLINK_PACKAGES+=	libgda
 
 .if !empty(LIBGDA_BUILDLINK3_MK:M+)
-BUILDLINK_DEPENDS.libgda+=	libgda>=1.0.3
-BUILDLINK_RECOMMENDED.libgda+=	libgda>=1.2.2nb2
+BUILDLINK_DEPENDS.libgda+=	libgda>=1.9.100
 BUILDLINK_PKGSRCDIR.libgda?=	../../databases/libgda
 
-PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda\/providers$$/ \
+PRINT_PLIST_AWK+=	/^@dirrm lib\/libgda-1.9\/providers$$/ \
+				{ print "@comment in libgda: " $$0; next; }
+PRINT_PLIST_AWK+=	/^@dirrm share\/libgda$$/ \
 				{ print "@comment in libgda: " $$0; next; }
 .endif	# LIBGDA_BUILDLINK3_MK
 
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index 5b37e5bb326..8b16232fb95 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.16 2005/10/26 10:08:24 drochner Exp $
+$NetBSD: distinfo,v 1.17 2006/02/04 17:02:45 wiz Exp $
 
-SHA1 (libgda-1.2.2.tar.bz2) = d4b3df54c022efa4b8f0132561f58b1d18d7fb1d
-RMD160 (libgda-1.2.2.tar.bz2) = 040c7184591f49ff932a1d9a7e6eecbde5a8301d
-Size (libgda-1.2.2.tar.bz2) = 1242035 bytes
-SHA1 (patch-aa) = 32cfb761a6d37e6f96de0bae2af3e03884a69526
-SHA1 (patch-ab) = 7850e95dbd09185b1ec4ef855490ef89b28c8daa
-SHA1 (patch-ac) = 34dbe05c9018d94a853bc5efaaa9385798c08537
-SHA1 (patch-ad) = 69f9464fd1bd1f3543808bf13de2dd5610a284b7
-SHA1 (patch-ae) = 20596d6c5e6827f5ebe497c0c1ce8725125612c4
-SHA1 (patch-af) = d3721169a22d26bf884e9ba3b8758c07d5355e28
+SHA1 (libgda-1.9.100.tar.bz2) = 3b524c481b31376eed6b049bf55d29fad87d4770
+RMD160 (libgda-1.9.100.tar.bz2) = 782daba45a6a324f81c2ace5b4febafc403df8bd
+Size (libgda-1.9.100.tar.bz2) = 1464595 bytes
+SHA1 (patch-aa) = aa93b53e2fb91650bdef82a55972ca2e1b68dd52
+SHA1 (patch-ab) = 0f1cd0809e956b2e67ae901c5e93cfe8445e1486
+SHA1 (patch-ac) = ef641e6137f2a796cd3982b6bbf4c1df899b7a32
+SHA1 (patch-ad) = 842c3d5fe1fd6d4dc3868739c836cc4fe924b528
 SHA1 (patch-ag) = 34d7de13a9140222a61ea6883bc9ebf67e756eda
+SHA1 (patch-ah) = 210bd516d89d7d7ca38657ca0c915f2616ca5399
+SHA1 (patch-ai) = 839045976de6be0db0fa77e6a5ca386a24808147
diff --git a/databases/libgda/patches/patch-aa b/databases/libgda/patches/patch-aa
index ac936ebdcaf..52db127618b 100644
--- a/databases/libgda/patches/patch-aa
+++ b/databases/libgda/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.5 2005/06/26 16:54:07 jmmv Exp $
+$NetBSD: patch-aa,v 1.6 2006/02/04 17:02:45 wiz Exp $
 
---- doc/C/Makefile.in.orig	2004-10-10 00:26:49.000000000 +0200
+--- doc/C/Makefile.in.orig	2005-10-13 10:11:27.000000000 +0200
 +++ doc/C/Makefile.in
-@@ -116,7 +116,7 @@ HAVE_SCROLLKEEPER_TRUE = @HAVE_SCROLLKEE
+@@ -138,7 +138,7 @@ HAVE_MSQL3 = @HAVE_MSQL3@
  HISTORY_LIB = @HISTORY_LIB@
  HISTORY_LIB_FALSE = @HISTORY_LIB_FALSE@
  HISTORY_LIB_TRUE = @HISTORY_LIB_TRUE@
diff --git a/databases/libgda/patches/patch-ab b/databases/libgda/patches/patch-ab
index 949ab5f7ebd..471954cc3dc 100644
--- a/databases/libgda/patches/patch-ab
+++ b/databases/libgda/patches/patch-ab
@@ -1,13 +1,13 @@
-$NetBSD: patch-ab,v 1.6 2005/02/24 19:17:10 drochner Exp $
+$NetBSD: patch-ab,v 1.7 2006/02/04 17:02:45 wiz Exp $
 
---- data/Makefile.in.orig	2004-10-10 00:26:49.000000000 +0200
+--- data/Makefile.in.orig	2005-10-13 10:11:26.000000000 +0200
 +++ data/Makefile.in
-@@ -283,7 +283,7 @@ sysconfdir = @sysconfdir@
+@@ -313,7 +313,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
  # Default global configuration file
 -configdir = $(sysconfdir)/libgda
-+configdir = $(sysconfdir)/examples/libgda
- config_DATA = config
++configdir = $(datadir)/examples/libgda
+ config_DATA = config sales_test.db
  xmldir = $(datadir)/libgda/xml
  xml_DATA = gda-xml-query.dtd 	\
diff --git a/databases/libgda/patches/patch-ac b/databases/libgda/patches/patch-ac
index e0660ee0226..b8c76c91c9b 100644
--- a/databases/libgda/patches/patch-ac
+++ b/databases/libgda/patches/patch-ac
@@ -1,13 +1,15 @@
-$NetBSD: patch-ac,v 1.4 2005/02/24 19:17:10 drochner Exp $
+$NetBSD: patch-ac,v 1.5 2006/02/04 17:02:45 wiz Exp $
 
---- libgda/Makefile.in.orig	2004-10-10 00:26:50.000000000 +0200
+--- libgda/Makefile.in.orig	2005-10-13 10:11:28.000000000 +0200
 +++ libgda/Makefile.in
-@@ -374,7 +374,7 @@ INCLUDES = \
+@@ -352,8 +352,8 @@ AM_CPPFLAGS = \
  	$(LIBGDA_CFLAGS) \
- 	-DLIBGDA_PLUGINDIR=\""$(prefix)/lib/libgda/providers"\" \
+ 	-DLIBGDA_PLUGINDIR=\""$(libdir)/libgda-$(GDA_MAJOR_VERSION).$(GDA_MINOR_VERSION)/providers"\" \
  	-DLIBGDA_LOCALEDIR=\""$(datadir)/locale"\" \
--	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\"
-+	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/config"\"
+-	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/libgda/config"\" \
+-	-DLIBGDA_GLOBAL_CONFIG_DIR=\""$(sysconfdir)/libgda"\"
++	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/config"\" \
++	-DLIBGDA_GLOBAL_CONFIG_DIR=\""$(sysconfdir)"\"
  
  gda_marshal_built_files = gda-marshal.h gda-marshal.c
  gda_headers = \
diff --git a/databases/libgda/patches/patch-ad b/databases/libgda/patches/patch-ad
index edf5769898a..c50a387fc88 100644
--- a/databases/libgda/patches/patch-ad
+++ b/databases/libgda/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.3 2005/02/24 19:17:10 drochner Exp $
+$NetBSD: patch-ad,v 1.4 2006/02/04 17:02:45 wiz Exp $
 
---- configure.orig	2004-12-28 14:20:35.000000000 +0100
+--- configure.orig	2005-10-13 10:11:25.000000000 +0200
 +++ configure
-@@ -24322,6 +24322,8 @@ else
+@@ -25506,6 +25506,8 @@ else
    BUILD_CONFIG_TOOL_TRUE='#'
    BUILD_CONFIG_TOOL_FALSE=
  fi
diff --git a/databases/libgda/patches/patch-ae b/databases/libgda/patches/patch-ae
deleted file mode 100644
index 815e192cf76..00000000000
--- a/databases/libgda/patches/patch-ae
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2005/02/25 17:50:48 drochner Exp $
-
---- libgda/gda-xml-database.c.orig	2004-05-24 19:09:57.000000000 +0200
-+++ libgda/gda-xml-database.c
-@@ -492,6 +492,9 @@ gda_xml_database_save (GdaXmlDatabase *x
- 
- 	g_return_val_if_fail (GDA_IS_XML_DATABASE (xmldb), FALSE);
- 
-+	if (!uri)
-+	  uri = xmldb->priv->uri;
-+
- 	xml = gda_xml_database_to_string (xmldb);
- 	if (xml) {
- 		result = gda_file_save (uri, xml, strlen (xml));
diff --git a/databases/libgda/patches/patch-af b/databases/libgda/patches/patch-af
deleted file mode 100644
index b8ec5f0e825..00000000000
--- a/databases/libgda/patches/patch-af
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.1 2005/02/25 17:50:48 drochner Exp $
-
---- po/Makefile.in.in.orig	2005-01-18 16:33:45.000000000 +0100
-+++ po/Makefile.in.in
-@@ -66,6 +66,8 @@ CATALOGS = @CATALOGS@
- CATOBJEXT = @CATOBJEXT@
- INSTOBJEXT = @INSTOBJEXT@
- 
-+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
-+
- .SUFFIXES:
- .SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat
- 
diff --git a/databases/libgda/patches/patch-ah b/databases/libgda/patches/patch-ah
new file mode 100644
index 00000000000..dc7c751ab2a
--- /dev/null
+++ b/databases/libgda/patches/patch-ah
@@ -0,0 +1,14 @@
+$NetBSD: patch-ah,v 1.1 2006/02/04 17:02:45 wiz Exp $
+
+--- providers/postgres/utils.c.orig	2005-09-22 10:24:01.000000000 +0000
++++ providers/postgres/utils.c
+@@ -26,6 +26,9 @@
+ #include <libgda/gda-intl.h>
+ #include <stdlib.h>
+ #include <string.h>
++#ifdef HAVE_LOCALE_H
++#include <locale.h>
++#endif
+ #include "gda-postgres.h"
+ #include "gda-postgres-blob.h"
+ 
diff --git a/databases/libgda/patches/patch-ai b/databases/libgda/patches/patch-ai
new file mode 100644
index 00000000000..6ab8a9e3dcb
--- /dev/null
+++ b/databases/libgda/patches/patch-ai
@@ -0,0 +1,22 @@
+$NetBSD: patch-ai,v 1.1 2006/02/04 17:02:45 wiz Exp $
+
+--- providers/postgres/Makefile.in.orig	2005-10-13 08:11:32.000000000 +0000
++++ providers/postgres/Makefile.in
+@@ -58,7 +58,7 @@ providerLTLIBRARIES_INSTALL = $(INSTALL)
+ LTLIBRARIES = $(provider_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+ libgda_postgres_la_DEPENDENCIES = $(am__DEPENDENCIES_1) \
+-	$(top_builddir)/libgda/libgda-3.la $(am__DEPENDENCIES_1)
++	$(am__DEPENDENCIES_1)
+ am_libgda_postgres_la_OBJECTS = gda-postgres-provider.lo \
+ 	gda-postgres-recordset.lo gda-postgres-blob.lo libmain.lo \
+ 	utils.lo
+@@ -360,7 +360,7 @@ libgda_postgres_la_SOURCES = \
+ libgda_postgres_la_LDFLAGS = -export-dynamic -module -avoid-version
+ libgda_postgres_la_LIBADD = \
+ 	$(LIBGDA_LIBS) \
+-	$(top_builddir)/libgda/libgda-3.la \
++	-llibgda-3 \
+ 	$(POSTGRES_LIBS)
+ 
+ EXTRA_DIST = $(config_DATA)