diff --git a/databases/libgda/distinfo b/databases/libgda/distinfo
index ae6bc467578f..a9933ecc68a9 100644
--- a/databases/libgda/distinfo
+++ b/databases/libgda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.32 2012/05/06 05:29:53 dholland Exp $
+$NetBSD: distinfo,v 1.33 2012/05/10 21:45:05 dholland Exp $
 
 SHA1 (libgda-3.0.1.tar.bz2) = 78c9054c4c40463020b8f62da72fca909dd9df03
 RMD160 (libgda-3.0.1.tar.bz2) = a9a1f71cc3a6faf8086bf3044b8de91dfc3f3032
@@ -11,6 +11,7 @@ SHA1 (patch-libgda_gda-column_c) = a290e71510d5f1171522a3a435dc3bcac2a13d30
 SHA1 (patch-libgda_gda-column_h) = 6ef0873737eca8ff005b739ea7c6a050044e9fa8
 SHA1 (patch-libgda_gda-command_c) = 9f8a27830fad60d4cb74dc9ab1e6ee1aba0483ce
 SHA1 (patch-libgda_gda-command_h) = ddcc2ca38c982e0f39c99cd5349a9da296e50254
+SHA1 (patch-libgda_gda-config_c) = 3813caaa6d76763c56c0fd985413d0e31fbacabe
 SHA1 (patch-libgda_gda-config_h) = 61afb51e75057b445ad9f6c0eb3b33fb470343f3
 SHA1 (patch-libgda_gda-data-model-array_c) = 8ca31d1cf8c18212e593d27fa23e5d1f4968a6d0
 SHA1 (patch-libgda_gda-data-model-filter-sql_c) = 748ad56779a532609a886652d7df922dc86c2d0a
@@ -28,4 +29,19 @@ SHA1 (patch-libgda_gda-util_c) = c8101c12d5db7d5e495db917e1688535c247100b
 SHA1 (patch-libgda_gda-util_h) = 507592a437ce2139af54a6fa5130a6e74550866b
 SHA1 (patch-libgda_gda-value_c) = f7ed4a4344971f0d3e9f6e5941333a3b0faa71bc
 SHA1 (patch-libgda_gda-value_h) = 7e9446931123ca90b0af9e3545fccc3306553132
+SHA1 (patch-providers_bdb_gda-bdb_h) = fc35534d84152430894e44f5644dcba0bd83160e
+SHA1 (patch-providers_freetds_gda-freetds-message_h) = 907a4636feba5b957163a847957794f2b5090e1c
+SHA1 (patch-providers_freetds_gda-freetds-types_h) = 8ffbf12c386a2915c5f25f82ff155bbc9b77b2a8
+SHA1 (patch-providers_freetds_gda-freetds_h) = 77ba0cb68d35ac4bf5c320ad474680c2e140a9bd
+SHA1 (patch-providers_ibmdb2_gda-ibmdb2-types_h) = 7e6be20fa6beb34d5d290ed54cde24b6152ac27b
+SHA1 (patch-providers_ibmdb2_gda-ibmdb2_h) = e35345f91ab9360606b4af030b2c8a14d1d9d6df
+SHA1 (patch-providers_ldap_gda-ldap_h) = 4934f09d918a81df194ba79d5c0a15c35e395fd4
+SHA1 (patch-providers_mdb_gda-mdb-provider_c) = 0de942475f271f29925ff4bd47c3a04f975bdd12
+SHA1 (patch-providers_mdb_gda-mdb_h) = 26396365c95a2407d996424c996627e21c09724f
+SHA1 (patch-providers_msql_gda-msql_h) = bd23fc1a4b38f8a1943ebf7a755cd93dcaa9c418
+SHA1 (patch-providers_mysql_gda-mysql_h) = 3098a669e9ce524e47f2325e6a5bb884dd2f2349
+SHA1 (patch-providers_odbc_gda-odbc_h) = 40784619e6979db452c4698100567d81d2a885d9
+SHA1 (patch-providers_oracle_gda-oracle_h) = 44cb1d383dc893ac76dc2a659fc3b81662080d24
+SHA1 (patch-providers_postgres_gda-postgres_h) = d2bc4acdf979175f25cdde4f1c73bfb9f9f1a67f
 SHA1 (patch-providers_sqlite_gda-sqlite_h) = a4bf8c7f6da3a25fa2bd2b9c390cafbe655b586f
+SHA1 (patch-providers_sybase_gda-sybase_h) = a7d1657500479c31d928fabda2372d713bdbc08a
diff --git a/databases/libgda/patches/patch-libgda_gda-config_c b/databases/libgda/patches/patch-libgda_gda-config_c
new file mode 100644
index 000000000000..a843cb7ea75e
--- /dev/null
+++ b/databases/libgda/patches/patch-libgda_gda-config_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-libgda_gda-config_c,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- libgda/gda-config.c~	2007-04-24 21:13:09.000000000 +0000
++++ libgda/gda-config.c
+@@ -37,7 +37,7 @@
+ #include <sys/stat.h>
+ #ifdef HAVE_FAM
+ #include <fam.h>
+-#include <glib/giochannel.h>
++#include <glib.h>
+ #include <sys/types.h>
+ #include <sys/stat.h>
+ #include <unistd.h>
diff --git a/databases/libgda/patches/patch-providers_bdb_gda-bdb_h b/databases/libgda/patches/patch-providers_bdb_gda-bdb_h
new file mode 100644
index 000000000000..9a829b6637a0
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_bdb_gda-bdb_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_bdb_gda-bdb_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/bdb/gda-bdb.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/bdb/gda-bdb.h
+@@ -25,7 +25,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <db.h>
diff --git a/databases/libgda/patches/patch-providers_freetds_gda-freetds-message_h b/databases/libgda/patches/patch-providers_freetds_gda-freetds-message_h
new file mode 100644
index 000000000000..56f8b89a21c1
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_freetds_gda-freetds-message_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_freetds_gda-freetds-message_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/freetds/gda-freetds-message.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/freetds/gda-freetds-message.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
diff --git a/databases/libgda/patches/patch-providers_freetds_gda-freetds-types_h b/databases/libgda/patches/patch-providers_freetds_gda-freetds-types_h
new file mode 100644
index 000000000000..a78071452464
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_freetds_gda-freetds-types_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_freetds_gda-freetds-types_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/freetds/gda-freetds-types.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/freetds/gda-freetds-types.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
diff --git a/databases/libgda/patches/patch-providers_freetds_gda-freetds_h b/databases/libgda/patches/patch-providers_freetds_gda-freetds_h
new file mode 100644
index 000000000000..a6197eb8973a
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_freetds_gda-freetds_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_freetds_gda-freetds_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/freetds/gda-freetds.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/freetds/gda-freetds.h
+@@ -24,7 +24,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <tds.h>
diff --git a/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2-types_h b/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2-types_h
new file mode 100644
index 000000000000..dc9f3b26e377
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2-types_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_ibmdb2_gda-ibmdb2-types_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/ibmdb2/gda-ibmdb2-types.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/ibmdb2/gda-ibmdb2-types.h
+@@ -23,7 +23,7 @@
+ #ifndef __GDA_IBMDB2_TYPES_H__
+ #define __GDA_IBMDB2_TYPES_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <sqlcli1.h>
diff --git a/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2_h b/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2_h
new file mode 100644
index 000000000000..8d733c9e1794
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_ibmdb2_gda-ibmdb2_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_ibmdb2_gda-ibmdb2_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/ibmdb2/gda-ibmdb2.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/ibmdb2/gda-ibmdb2.h
+@@ -23,7 +23,7 @@
+ #if !defined(__gda_ibmdb2_h__)
+ #  define __gda_ibmdb2_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
diff --git a/databases/libgda/patches/patch-providers_ldap_gda-ldap_h b/databases/libgda/patches/patch-providers_ldap_gda-ldap_h
new file mode 100644
index 000000000000..8a740f037828
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_ldap_gda-ldap_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_ldap_gda-ldap_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/ldap/gda-ldap.h~	2007-04-24 21:13:12.000000000 +0000
++++ providers/ldap/gda-ldap.h
+@@ -26,7 +26,7 @@
+ #if !defined(__gda_ldap_h__)
+ #  define __gda_ldap_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_mdb_gda-mdb-provider_c b/databases/libgda/patches/patch-providers_mdb_gda-mdb-provider_c
new file mode 100644
index 000000000000..4b43dd445e07
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_mdb_gda-mdb-provider_c
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_mdb_gda-mdb-provider_c,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/mdb/gda-mdb-provider.c~	2007-04-24 21:13:17.000000000 +0000
++++ providers/mdb/gda-mdb-provider.c
+@@ -22,7 +22,7 @@
+  */
+ 
+ #include <stdlib.h>
+-#include <glib/gbacktrace.h>
++#include <glib.h>
+ #include <libgda/gda-data-model-array.h>
+ #include <libgda/gda-data-model-private.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_mdb_gda-mdb_h b/databases/libgda/patches/patch-providers_mdb_gda-mdb_h
new file mode 100644
index 000000000000..6f6036193a18
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_mdb_gda-mdb_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_mdb_gda-mdb_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/mdb/gda-mdb.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/mdb/gda-mdb.h
+@@ -23,7 +23,7 @@
+ #if !defined(__gda_mdb_h__)
+ #  define __gda_mdb_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_msql_gda-msql_h b/databases/libgda/patches/patch-providers_msql_gda-msql_h
new file mode 100644
index 000000000000..3a71ae793442
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_msql_gda-msql_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_msql_gda-msql_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/msql/gda-msql.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/msql/gda-msql.h
+@@ -22,7 +22,7 @@
+ #ifndef __gda_msql_h__
+ #define __gda_msql_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_mysql_gda-mysql_h b/databases/libgda/patches/patch-providers_mysql_gda-mysql_h
new file mode 100644
index 000000000000..7589b0ec98c3
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_mysql_gda-mysql_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_mysql_gda-mysql_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/mysql/gda-mysql.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/mysql/gda-mysql.h
+@@ -25,7 +25,7 @@
+ #if !defined(__gda_mysql_h__)
+ #  define __gda_mysql_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_odbc_gda-odbc_h b/databases/libgda/patches/patch-providers_odbc_gda-odbc_h
new file mode 100644
index 000000000000..e3d54c239f2c
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_odbc_gda-odbc_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_odbc_gda-odbc_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/odbc/gda-odbc.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/odbc/gda-odbc.h
+@@ -25,7 +25,7 @@
+ #if !defined(__gda_odbc_h__)
+ #  define __gda_odbc_h__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib-object.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
diff --git a/databases/libgda/patches/patch-providers_oracle_gda-oracle_h b/databases/libgda/patches/patch-providers_oracle_gda-oracle_h
new file mode 100644
index 000000000000..748cc3adaebf
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_oracle_gda-oracle_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_oracle_gda-oracle_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/oracle/gda-oracle.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/oracle/gda-oracle.h
+@@ -31,7 +31,7 @@
+ #if defined(HAVE_CONFIG_H)
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <libgda/gda-connection.h>
+ #include <libgda/gda-server-provider.h>
+ #include <glib/gi18n-lib.h>
diff --git a/databases/libgda/patches/patch-providers_postgres_gda-postgres_h b/databases/libgda/patches/patch-providers_postgres_gda-postgres_h
new file mode 100644
index 000000000000..ca47c224759b
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_postgres_gda-postgres_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_postgres_gda-postgres_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/postgres/gda-postgres.h~	2007-04-24 21:13:17.000000000 +0000
++++ providers/postgres/gda-postgres.h
+@@ -24,7 +24,7 @@
+ #ifndef __GDA_POSTGRES_H__
+ #define __GDA_POSTGRES_H__
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include "gda-postgres-provider.h"
diff --git a/databases/libgda/patches/patch-providers_sybase_gda-sybase_h b/databases/libgda/patches/patch-providers_sybase_gda-sybase_h
new file mode 100644
index 000000000000..da644d307685
--- /dev/null
+++ b/databases/libgda/patches/patch-providers_sybase_gda-sybase_h
@@ -0,0 +1,15 @@
+$NetBSD: patch-providers_sybase_gda-sybase_h,v 1.1 2012/05/10 21:45:05 dholland Exp $
+
+Fix build with latest glib2.
+
+--- providers/sybase/gda-sybase.h~	2007-04-24 21:13:13.000000000 +0000
++++ providers/sybase/gda-sybase.h
+@@ -32,7 +32,7 @@
+ #  include <config.h>
+ #endif
+ 
+-#include <glib/gmacros.h>
++#include <glib.h>
+ #include <glib/gi18n-lib.h>
+ #include <libgda/gda-server-provider.h>
+ #include <ctpublic.h>