10 files changed, 199 insertions, 70 deletions
diff --git a/databases/libgda-postgres/Makefile b/databases/libgda-postgres/Makefile
index 7cbd839db4d..93d0dc4937b 100644
--- a/databases/libgda-postgres/Makefile
+++ b/databases/libgda-postgres/Makefile
@@ -1,12 +1,10 @@
-# $NetBSD: Makefile,v 1.8 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: Makefile,v 1.9 2006/04/02 22:46:55 wiz Exp $
 #
 
 LIBGDA_PROVIDER=	postgres
 
 .include "../../databases/libgda/Makefile.common"
 
-PKGREVISION=		1
-
 CONFIGURE_ARGS+=	--with-postgres=${PGSQL_PREFIX:Q}
 
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/databases/libgda/Makefile b/databases/libgda/Makefile
index 8aea232f68a..b8f1e05ad1a 100644
--- a/databases/libgda/Makefile
+++ b/databases/libgda/Makefile
@@ -1,10 +1,8 @@
-# $NetBSD: Makefile,v 1.18 2006/02/05 23:08:31 joerg Exp $
+# $NetBSD: Makefile,v 1.19 2006/04/02 22:46:55 wiz Exp $
 #
 
 .include "Makefile.common"
 
-PKGREVISION=		1
-
 PKGCONFIG_OVERRIDE=	libgda-2.0.pc.in
 
 PKG_SYSCONFSUBDIR=	libgda
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index 94a544988ed..47ab27b305c 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.38 2006/03/04 21:29:08 jlam Exp $
+# $NetBSD: Makefile.common,v 1.39 2006/04/02 22:46:55 wiz Exp $
 #
 
-DISTNAME=		libgda-1.9.100
+DISTNAME=		libgda-1.9.102
 CATEGORIES=		databases gnome
 MASTER_SITES=		${MASTER_SITE_GNOME:=sources/libgda/1.9/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/databases/libgda/PLIST b/databases/libgda/PLIST
index bbe1924497a..475a83c5733 100644
--- a/databases/libgda/PLIST
+++ b/databases/libgda/PLIST
@@ -1,7 +1,13 @@
-@comment $NetBSD: PLIST,v 1.13 2006/02/04 17:02:45 wiz Exp $
+@comment $NetBSD: PLIST,v 1.14 2006/04/02 22:46:55 wiz Exp $
+bin/gda-author-dict-file
+bin/gda-diagnose
+bin/gda-inspect-dict-file
+bin/gda-list-config
 bin/gda-report-test
 bin/gda-run
-bin/gda-test
+bin/gda-test-delimiter
+bin/gda-test-models
+bin/gda-test-sql
 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
@@ -25,52 +31,148 @@ 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-access-wrapper.h
+include/libgda-1.9/libgda/gda-data-handler.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-extra.h
+include/libgda-1.9/libgda/gda-data-model-filter-sql.h
 include/libgda-1.9/libgda/gda-data-model-hash.h
+include/libgda-1.9/libgda/gda-data-model-import.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-iter.h
+include/libgda-1.9/libgda/gda-data-model-private.h
+include/libgda-1.9/libgda/gda-data-model-query.h
+include/libgda-1.9/libgda/gda-data-model-row.h
 include/libgda-1.9/libgda/gda-data-model.h
+include/libgda-1.9/libgda/gda-data-proxy.h
+include/libgda-1.9/libgda/gda-decl.h
+include/libgda-1.9/libgda/gda-dict-aggregate.h
+include/libgda-1.9/libgda/gda-dict-constraint.h
+include/libgda-1.9/libgda/gda-dict-database.h
+include/libgda-1.9/libgda/gda-dict-field.h
+include/libgda-1.9/libgda/gda-dict-function.h
+include/libgda-1.9/libgda/gda-dict-table.h
+include/libgda-1.9/libgda/gda-dict-type.h
+include/libgda-1.9/libgda/gda-dict.h
+include/libgda-1.9/libgda/gda-entity-field.h
+include/libgda-1.9/libgda/gda-entity.h
 include/libgda-1.9/libgda/gda-enum-types.h
+include/libgda-1.9/libgda/gda-enums.h
+include/libgda-1.9/libgda/gda-graphviz.h
 include/libgda-1.9/libgda/gda-log.h
 include/libgda-1.9/libgda/gda-marshal.h
+include/libgda-1.9/libgda/gda-object-ref.h
+include/libgda-1.9/libgda/gda-object.h
+include/libgda-1.9/libgda/gda-parameter-list.h
 include/libgda-1.9/libgda/gda-parameter.h
 include/libgda-1.9/libgda/gda-quark-list.h
+include/libgda-1.9/libgda/gda-query-condition.h
+include/libgda-1.9/libgda/gda-query-field-agg.h
+include/libgda-1.9/libgda/gda-query-field-all.h
+include/libgda-1.9/libgda/gda-query-field-field.h
+include/libgda-1.9/libgda/gda-query-field-func.h
+include/libgda-1.9/libgda/gda-query-field-value.h
+include/libgda-1.9/libgda/gda-query-field.h
+include/libgda-1.9/libgda/gda-query-join.h
+include/libgda-1.9/libgda/gda-query-object.h
+include/libgda-1.9/libgda/gda-query-parsing.h
+include/libgda-1.9/libgda/gda-query-private.h
+include/libgda-1.9/libgda/gda-query-target.h
+include/libgda-1.9/libgda/gda-query.h
+include/libgda-1.9/libgda/gda-referer.h
+include/libgda-1.9/libgda/gda-renderer.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-extra.h
+include/libgda-1.9/libgda/gda-server-provider-private.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/gda-xml-storage.h
+include/libgda-1.9/libgda/graph/gda-graph-item.h
+include/libgda-1.9/libgda/graph/gda-graph-query.h
+include/libgda-1.9/libgda/graph/gda-graph.h
+include/libgda-1.9/libgda/handlers/gda-handler-bin.h
+include/libgda-1.9/libgda/handlers/gda-handler-boolean.h
+include/libgda-1.9/libgda/handlers/gda-handler-numerical.h
+include/libgda-1.9/libgda/handlers/gda-handler-string.h
+include/libgda-1.9/libgda/handlers/gda-handler-time.h
+include/libgda-1.9/libgda/handlers/gda-handler-type.h
 include/libgda-1.9/libgda/libgda.h
-include/libgda-1.9/sql/sql_parser.h
+include/libgda-1.9/libsql/sql_parser.h
+include/libgda-1.9/sql-delimiter/gda-sql-delimiter.h
 lib/libgda-1.9/providers/libgda-sqlite.la
 lib/libgda-3.la
 lib/libgda-report-3.la
+lib/libgda_graph-3.la
+lib/libgda_handlers-3.la
+lib/libgda_sql_delimiter-3.la
 lib/libgdasql.la
 lib/pkgconfig/libgda-2.0.pc
+share/doc/libgda/GdaBlob.html
 share/doc/libgda/GdaClient.html
 share/doc/libgda/GdaColumn.html
 share/doc/libgda/GdaColumnIndex.html
+share/doc/libgda/GdaConnection.html
+share/doc/libgda/GdaConnectionEvent.html
+share/doc/libgda/GdaDataAccessWrapper.html
 share/doc/libgda/GdaDataModel.html
 share/doc/libgda/GdaDataModelArray.html
+share/doc/libgda/GdaDataModelFilterSQL.html
 share/doc/libgda/GdaDataModelHash.html
-share/doc/libgda/GdaDataModelList.html
-share/doc/libgda/GdaRow.html
-share/doc/libgda/GdaSelect.html
+share/doc/libgda/GdaDataModelImport.html
+share/doc/libgda/GdaDataModelIter.html
+share/doc/libgda/GdaDataModelQuery.html
+share/doc/libgda/GdaDataModelRow.html
+share/doc/libgda/GdaDataProxy.html
+share/doc/libgda/GdaDict.html
+share/doc/libgda/GdaDictAggregate.html
+share/doc/libgda/GdaDictConstraint.html
+share/doc/libgda/GdaDictDatabase.html
+share/doc/libgda/GdaDictField.html
+share/doc/libgda/GdaDictFunction.html
+share/doc/libgda/GdaDictTable.html
+share/doc/libgda/GdaDictType.html
+share/doc/libgda/GdaEntity.html
+share/doc/libgda/GdaEntityField.html
+share/doc/libgda/GdaGraphviz.html
+share/doc/libgda/GdaObject.html
+share/doc/libgda/GdaObjectRef.html
+share/doc/libgda/GdaParameter.html
+share/doc/libgda/GdaParameterList.html
+share/doc/libgda/GdaQuery.html
+share/doc/libgda/GdaQueryCondition.html
+share/doc/libgda/GdaQueryField.html
+share/doc/libgda/GdaQueryFieldAgg.html
+share/doc/libgda/GdaQueryFieldAll.html
+share/doc/libgda/GdaQueryFieldField.html
+share/doc/libgda/GdaQueryFieldFunc.html
+share/doc/libgda/GdaQueryFieldValue.html
+share/doc/libgda/GdaQueryJoin.html
+share/doc/libgda/GdaQueryObject.html
+share/doc/libgda/GdaQueryTarget.html
+share/doc/libgda/GdaReferer.html
+share/doc/libgda/GdaRenderer.html
 share/doc/libgda/GdaServerProvider.html
+share/doc/libgda/GdaThreader.html
 share/doc/libgda/GdaTransaction.html
+share/doc/libgda/GdaXmlStorage.html
 share/doc/libgda/architecture.html
+share/doc/libgda/ch04s03.html
+share/doc/libgda/ch05s04.html
+share/doc/libgda/ch05s05.html
+share/doc/libgda/ch05s06.html
 share/doc/libgda/ch06.html
-share/doc/libgda/ch09s04.html
-share/doc/libgda/ch09s05.html
-share/doc/libgda/ch09s06.html
+share/doc/libgda/ch10.html
+share/doc/libgda/ch11.html
+share/doc/libgda/ch13.html
+share/doc/libgda/ch14.html
 share/doc/libgda/compiling.html
-share/doc/libgda/connecting.html
+share/doc/libgda/connection.html
 share/doc/libgda/connections.html
 share/doc/libgda/data-model.html
+share/doc/libgda/data_models.html
 share/doc/libgda/fdl-section1.html
 share/doc/libgda/fdl-section10.html
 share/doc/libgda/fdl-section2.html
@@ -83,21 +185,23 @@ share/doc/libgda/fdl-section8.html
 share/doc/libgda/fdl-section9.html
 share/doc/libgda/fdl-using.html
 share/doc/libgda/fdl.html
+share/doc/libgda/getting_started.html
 share/doc/libgda/home.png
 share/doc/libgda/index.html
 share/doc/libgda/index.sgml
+share/doc/libgda/init_config.html
 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-BLOBs.html
-share/doc/libgda/libgda-Commands.html
-share/doc/libgda/libgda-GdaConnection.html
-share/doc/libgda/libgda-GdaConnectionEvent.html
+share/doc/libgda/libgda-Configuration.html
+share/doc/libgda/libgda-GdaCommand.html
 share/doc/libgda/libgda-GdaDataModelIndex.html
-share/doc/libgda/libgda-GdaParameter.html
+share/doc/libgda/libgda-GdaGraph.html
+share/doc/libgda/libgda-GdaGraphItem.html
+share/doc/libgda/libgda-GdaGraphQuery.html
 share/doc/libgda/libgda-GdaReportDocument.html
 share/doc/libgda/libgda-GdaReportItem.html
 share/doc/libgda/libgda-GdaReportItemDetail.html
@@ -116,14 +220,30 @@ 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-config.html
-share/doc/libgda/libgda-gda-data-model-base.html
 share/doc/libgda/libgda-gda-report-types.html
+share/doc/libgda/libgda-provider-begin-transaction.html
+share/doc/libgda/libgda-provider-change-database.html
 share/doc/libgda/libgda-provider-class.html
+share/doc/libgda/libgda-provider-close-connection.html
+share/doc/libgda/libgda-provider-commit-transaction.html
+share/doc/libgda/libgda-provider-create-database-cnc.html
+share/doc/libgda/libgda-provider-drop-database-cnc.html
+share/doc/libgda/libgda-provider-execute-command.html
+share/doc/libgda/libgda-provider-get-database.html
+share/doc/libgda/libgda-provider-get-schema.html
+share/doc/libgda/libgda-provider-get-specs.html
+share/doc/libgda/libgda-provider-introduction.html
+share/doc/libgda/libgda-provider-perform-action-params.html
 share/doc/libgda/libgda-provider-recordset.html
-share/doc/libgda/libgda-providers.html
+share/doc/libgda/libgda-provider-rollback-transaction.html
+share/doc/libgda/libgda-provider-supports.html
+share/doc/libgda/libgda-reports-introduction.html
 share/doc/libgda/libgda-reports.html
+share/doc/libgda/libgda-tools-author-dict.html
+share/doc/libgda/libgda-tools-diagnose.html
+share/doc/libgda/libgda-tools-inspect-dict.html
+share/doc/libgda/libgda-tools-introduction.html
+share/doc/libgda/libgda-tools-list-config.html
 share/doc/libgda/libgda.devhelp
 share/doc/libgda/main_example.html
 share/doc/libgda/manage-gdavalue.html
@@ -131,12 +251,20 @@ share/doc/libgda/managing-errors.html
 share/doc/libgda/migration-configuration.html
 share/doc/libgda/migration-executing-commands.html
 share/doc/libgda/migration.html
-share/doc/libgda/processing-queries.html
+share/doc/libgda/misc.html
+share/doc/libgda/part_begin.html
+share/doc/libgda/part_libgda-reports.html
+share/doc/libgda/part_libgda_api.html
+share/doc/libgda/part_providers.html
+share/doc/libgda/part_tools.html
 share/doc/libgda/right.png
 share/doc/libgda/style.css
+share/doc/libgda/transactions.html
 share/doc/libgda/up.png
 share/examples/libgda/config
 share/examples/libgda/sales_test.db
+share/libgda/dtd/libgda-array.dtd
+share/libgda/dtd/libgda-dict.dtd
 share/libgda/sqlite_specs_create_db.xml
 share/libgda/sqlite_specs_dsn.xml
 share/libgda/xml/gda-report-result.dtd
@@ -184,14 +312,20 @@ ${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_HK/LC_MESSAGES/libgda-3.mo
 ${PKGLOCALEDIR}/locale/zh_TW/LC_MESSAGES/libgda-3.mo
 @dirrm share/libgda/xml
+@dirrm share/libgda/dtd
 @dirrm share/libgda
 @dirrm share/examples/libgda
 @dirrm share/doc/libgda
 @dirrm lib/libgda-1.9/providers
 @dirrm lib/libgda-1.9
-@dirrm include/libgda-1.9/sql
+@dirrm include/libgda-1.9/sql-delimiter
+@dirrm include/libgda-1.9/libsql
+@dirrm include/libgda-1.9/libgda/handlers
+@dirrm include/libgda-1.9/libgda/graph
 @dirrm include/libgda-1.9/libgda-report
 @dirrm include/libgda-1.9/libgda
 @dirrm include/libgda-1.9
+@dirrm etc/libgda
diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index b42b4547c6b..ecb6a093575 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,12 +1,11 @@
-$NetBSD: distinfo,v 1.18 2006/02/04 17:16:46 wiz Exp $
+$NetBSD: distinfo,v 1.19 2006/04/02 22:46:55 wiz Exp $
 
-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 (libgda-1.9.102.tar.bz2) = 6ad5ee58a4716b7d6a71a4dd9ba1767a2606b522
+RMD160 (libgda-1.9.102.tar.bz2) = 7ef4cf298a563410fdb173860da81da9de919f49
+Size (libgda-1.9.102.tar.bz2) = 1935950 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) = 0e7347500903fa76119a23b878c86552fa108bb9
+SHA1 (patch-ab) = f38ccf23ce67e9ac1d1b633e451d786f9e6d2a8f
+SHA1 (patch-ac) = 9a553439557531b23a35b279d1e95a44d94c29a9
+SHA1 (patch-ad) = 1fb0ee4f17ab66e60c7445a99649e69bfad334ca
+SHA1 (patch-ah) = 1a2ef8200b2ccedb632e7f952c7e214128c51693
+SHA1 (patch-ai) = 46da46dca253791de12976a2c81638bfa300c10c
diff --git a/databases/libgda/patches/patch-ab b/databases/libgda/patches/patch-ab
index 471954cc3dc..8aa5b12ae81 100644
--- a/databases/libgda/patches/patch-ab
+++ b/databases/libgda/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2006/02/04 17:02:45 wiz Exp $
+$NetBSD: patch-ab,v 1.8 2006/04/02 22:46:55 wiz Exp $
 
---- data/Makefile.in.orig	2005-10-13 10:11:26.000000000 +0200
+--- data/Makefile.in.orig	2006-03-24 10:14:54.000000000 +0000
 +++ data/Makefile.in
-@@ -313,7 +313,7 @@ sysconfdir = @sysconfdir@
+@@ -314,7 +314,7 @@ sysconfdir = @sysconfdir@
  target_alias = @target_alias@
  
  # Default global configuration file
diff --git a/databases/libgda/patches/patch-ac b/databases/libgda/patches/patch-ac
index b8c76c91c9b..1531cd4c466 100644
--- a/databases/libgda/patches/patch-ac
+++ b/databases/libgda/patches/patch-ac
@@ -1,15 +1,15 @@
-$NetBSD: patch-ac,v 1.5 2006/02/04 17:02:45 wiz Exp $
+$NetBSD: patch-ac,v 1.6 2006/04/02 22:46:55 wiz Exp $
 
---- libgda/Makefile.in.orig	2005-10-13 10:11:28.000000000 +0200
+--- libgda/Makefile.in.orig	2006-03-24 10:14:55.000000000 +0000
 +++ libgda/Makefile.in
-@@ -352,8 +352,8 @@ AM_CPPFLAGS = \
+@@ -378,8 +378,8 @@ AM_CPPFLAGS = \
  	$(LIBGDA_CFLAGS) \
  	-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_DIR=\""$(sysconfdir)/libgda"\"
+-	-DLIBGDA_GLOBAL_CONFIG_DIR=\""$(sysconfdir)/libgda"\" \
 +	-DLIBGDA_GLOBAL_CONFIG_FILE=\""$(sysconfdir)/config"\" \
-+	-DLIBGDA_GLOBAL_CONFIG_DIR=\""$(sysconfdir)"\"
++	-DLIBGDA_GLOBAL_CONFIG_DIR=\""$(sysconfdir)"\" \
+ 	-DDTDINSTALLDIR=\""$(LIBGDA_DTDDIR)"\"
  
  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 c50a387fc88..bd0eec97bda 100644
--- a/databases/libgda/patches/patch-ad
+++ b/databases/libgda/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2006/02/04 17:02:45 wiz Exp $
+$NetBSD: patch-ad,v 1.5 2006/04/02 22:46:55 wiz Exp $
 
---- configure.orig	2005-10-13 10:11:25.000000000 +0200
+--- configure.orig	2006-03-24 10:14:53.000000000 +0000
 +++ configure
-@@ -25506,6 +25506,8 @@ else
+@@ -24774,6 +24774,8 @@ else
    BUILD_CONFIG_TOOL_TRUE='#'
    BUILD_CONFIG_TOOL_FALSE=
  fi
diff --git a/databases/libgda/patches/patch-ah b/databases/libgda/patches/patch-ah
index dc7c751ab2a..36252682cf0 100644
--- a/databases/libgda/patches/patch-ah
+++ b/databases/libgda/patches/patch-ah
@@ -1,9 +1,9 @@
-$NetBSD: patch-ah,v 1.1 2006/02/04 17:02:45 wiz Exp $
+$NetBSD: patch-ah,v 1.2 2006/04/02 22:46:55 wiz Exp $
 
---- providers/postgres/utils.c.orig	2005-09-22 10:24:01.000000000 +0000
+--- providers/postgres/utils.c.orig	2006-02-04 21:13:43.000000000 +0000
 +++ providers/postgres/utils.c
 @@ -26,6 +26,9 @@
- #include <libgda/gda-intl.h>
+ #include <glib/gi18n-lib.h>
  #include <stdlib.h>
  #include <string.h>
 +#ifdef HAVE_LOCALE_H
@@ -11,4 +11,4 @@ $NetBSD: patch-ah,v 1.1 2006/02/04 17:02:45 wiz Exp $
 +#endif
  #include "gda-postgres.h"
  #include "gda-postgres-blob.h"
- 
+ #ifdef HAVE_LOCALE_H
diff --git a/databases/libgda/patches/patch-ai b/databases/libgda/patches/patch-ai
index bd442cb2ae4..2c5ff269da5 100644
--- a/databases/libgda/patches/patch-ai
+++ b/databases/libgda/patches/patch-ai
@@ -1,22 +1,22 @@
-$NetBSD: patch-ai,v 1.2 2006/02/04 17:16:46 wiz Exp $
+$NetBSD: patch-ai,v 1.3 2006/04/02 22:46:55 wiz Exp $
 
---- providers/postgres/Makefile.in.orig	2005-10-13 08:11:32.000000000 +0000
+--- providers/postgres/Makefile.in.orig	2006-03-24 10:14:58.000000000 +0000
 +++ providers/postgres/Makefile.in
-@@ -58,7 +58,7 @@ providerLTLIBRARIES_INSTALL = $(INSTALL)
+@@ -57,7 +57,7 @@ am__installdirs = "$(DESTDIR)$(providerd
+ 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)
+-libgda_postgres_la_DEPENDENCIES = $(top_builddir)/libgda/libgda-3.la \
++libgda_postgres_la_DEPENDENCIES = \
+ 	$(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
+@@ -358,7 +358,7 @@ libgda_postgres_la_SOURCES = \
+ 
+ libgda_postgres_la_LDFLAGS = -export-dynamic -module -avoid-version -no-undefined
  libgda_postgres_la_LIBADD = \
- 	$(LIBGDA_LIBS) \
 -	$(top_builddir)/libgda/libgda-3.la \
 +	-lgda-3 \
+ 	$(LIBGDA_LIBS) \
  	$(POSTGRES_LIBS)
  
- EXTRA_DIST = $(config_DATA)