13 files changed, 23 insertions, 25 deletions

diff --git a/databases/libgda2/Makefile b/databases/libgda2/Makefile
index bf2ca06586bf..acfe676b2d7e 100644
--- a/databases/libgda2/Makefile
+++ b/databases/libgda2/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.11
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/databases/libgda2/distinfo b/databases/libgda2/distinfo
index 94e335653dde..5ad784e84494 100644
--- a/databases/libgda2/distinfo
+++ b/databases/libgda2/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgda-0.10.0.tar.bz2) = 7d8ab6091d7a90e4b92fe6d123e6ae88
+MD5 (gnome2/libgda-0.11.0.tar.bz2) = 8e50d1082033f413c8e8b700b078194b
diff --git a/databases/libgda2/pkg-plist b/databases/libgda2/pkg-plist
index 8882e5c2312a..1c9c98253014 100644
--- a/databases/libgda2/pkg-plist
+++ b/databases/libgda2/pkg-plist
@@ -13,6 +13,7 @@ include/libgda-report/gda-report-item-reportfooter.h
 include/libgda-report/gda-report-item-reportheader.h
 include/libgda-report/gda-report-item-sqlquery.h
 include/libgda-report/gda-report-item.h
+include/libgda-report/gda-report-result.h
 include/libgda-report/gda-report-types.h
 include/libgda-report/gda-report-valid.h
 include/libgda-report/gda-report.h
@@ -176,6 +177,7 @@ share/doc/libgda/x883.html
 share/doc/libgda/x885.html
 share/doc/libgda/x887.html
 share/gnome/libgda/xml/gda-report.dtd
+share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
 share/gnome/omf/libgda/libgda-C.omf
diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index bf2ca06586bf..acfe676b2d7e 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.11
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index 94e335653dde..5ad784e84494 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgda-0.10.0.tar.bz2) = 7d8ab6091d7a90e4b92fe6d123e6ae88
+MD5 (gnome2/libgda-0.11.0.tar.bz2) = 8e50d1082033f413c8e8b700b078194b
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 8882e5c2312a..1c9c98253014 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -13,6 +13,7 @@ include/libgda-report/gda-report-item-reportfooter.h
 include/libgda-report/gda-report-item-reportheader.h
 include/libgda-report/gda-report-item-sqlquery.h
 include/libgda-report/gda-report-item.h
+include/libgda-report/gda-report-result.h
 include/libgda-report/gda-report-types.h
 include/libgda-report/gda-report-valid.h
 include/libgda-report/gda-report.h
@@ -176,6 +177,7 @@ share/doc/libgda/x883.html
 share/doc/libgda/x885.html
 share/doc/libgda/x887.html
 share/gnome/libgda/xml/gda-report.dtd
+share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
 share/gnome/libgda/xml/gda-xml-query.xsl
 share/gnome/omf/libgda/libgda-C.omf
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index c00a5ff9586e..e4c9478c9658 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libgnomedb
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/libgnomedb/0.10
+MASTER_SITE_SUBDIR=	sources/libgnomedb/0.11
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
diff --git a/databases/libgnomedb/distinfo b/databases/libgnomedb/distinfo
index 25a2e6ac8202..71cf307bf705 100644
--- a/databases/libgnomedb/distinfo
+++ b/databases/libgnomedb/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgnomedb-0.10.0.tar.bz2) = edbc2fdc604694f8bd43b479f8805b91
+MD5 (gnome2/libgnomedb-0.11.0.tar.bz2) = efb8f768da6cb6e8117487c3c9d9523c
diff --git a/databases/libgnomedb/files/patch-doc_C_Makefile.in b/databases/libgnomedb/files/patch-doc_C_Makefile.in
deleted file mode 100644
index 4411a5bf37d5..000000000000
--- a/databases/libgnomedb/files/patch-doc_C_Makefile.in
+++ /dev/null
@@ -1,11 +0,0 @@
---- doc/C/Makefile.in.orig	Sun Jun  2 23:38:54 2002
-+++ doc/C/Makefile.in	Sun Jun  2 23:39:46 2002
-@@ -131,7 +131,7 @@
- cxxflags_set = @cxxflags_set@
- 
- DOC_MODULE = libgnomedb
--HTML_DIR = $(datadir)/gtk-doc/html
-+HTML_DIR = $(prefix)/share/doc
- 
- # The top-level SGML file. Change it if you want.
- DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.sgml
diff --git a/databases/libgnomedb/pkg-plist b/databases/libgnomedb/pkg-plist
index 4a283be9cdb5..af102de7641e 100644
--- a/databases/libgnomedb/pkg-plist
+++ b/databases/libgnomedb/pkg-plist
@@ -40,7 +40,7 @@ lib/gnome-vfs-2.0/modules/libdatabase.so
 lib/libglade/2.0/libgnomedb.so
 lib/libgnomedb-2.a
 lib/libgnomedb-2.so
-lib/libgnomedb-2.so.1
+lib/libgnomedb-2.so.2
 libdata/pkgconfig/libgnomedb.pc
 libdata/bonobo/servers/GNOME_Database_Components.server
 libdata/bonobo/servers/GNOME_Database_Monikers.server
@@ -99,6 +99,7 @@ share/gnome/omf/libgnomedb/libgnomedb-C.omf
 @exec scrollkeeper-install -q %D/share/gnome/omf/libgnomedb/libgnomedb-C.omf 2>/dev/null || /usr/bin/true
 share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-aggregates_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-commit_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-connect_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-database_24x24.png
@@ -110,6 +111,7 @@ share/gnome/pixmaps/libgnomedb/gnome-db-procedures_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-procedures_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-query_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-query_24x24.png
+share/gnome/pixmaps/libgnomedb/gnome-db-rollback_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sequences_16x16.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sequences_24x24.png
 share/gnome/pixmaps/libgnomedb/gnome-db-sql_16x16.png
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 7911d297f525..4a511c1e832d 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -6,16 +6,16 @@
 #
 
 PORTNAME=	mergeant
-PORTVERSION=	0.10.0
+PORTVERSION=	0.11.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.10
+MASTER_SITE_SUBDIR=	sources/${PORTNAME}/0.11
 DIST_SUBDIR=	gnome2
 
 MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provide uniform access to data sources for the GNOME 2.0 environment
 
-LIB_DEPENDS=	gnomedb-2.1:${PORTSDIR}/databases/libgnomedb \
+LIB_DEPENDS=	gnomedb-2.2:${PORTSDIR}/databases/libgnomedb \
 		gnomeprintui-2-2.0:${PORTSDIR}/x11-toolkits/libgnomeprintui
 
 USE_BZIP2=	yes
diff --git a/databases/mergeant/distinfo b/databases/mergeant/distinfo
index f65e8c1f64af..8989c2cb1c5e 100644
--- a/databases/mergeant/distinfo
+++ b/databases/mergeant/distinfo
@@ -1 +1 @@
-MD5 (gnome2/mergeant-0.10.0.tar.bz2) = 2e8b98332288d07a5e1cbdfd0a828f2f
+MD5 (gnome2/mergeant-0.11.0.tar.bz2) = 137b73af05fffed1be0dd470e66e9620
diff --git a/databases/mergeant/pkg-plist b/databases/mergeant/pkg-plist
index dea19a0e9515..ce43289e58ea 100644
--- a/databases/mergeant/pkg-plist
+++ b/databases/mergeant/pkg-plist
@@ -26,6 +26,7 @@ share/gnome/pixmaps/mergeant/mergeant_tables.png
 share/gnome/pixmaps/mergeant/query-view-query_16x16.png
 share/gnome/pixmaps/mergeant/query-view-table_16x16.png
 share/gnome/pixmaps/mergeant/query-view-view_16x16.png
+share/locale/am/LC_MESSAGES/mergeant.mo
 share/locale/cs/LC_MESSAGES/mergeant.mo
 share/locale/da/LC_MESSAGES/mergeant.mo
 share/locale/de/LC_MESSAGES/mergeant.mo
@@ -36,11 +37,13 @@ share/locale/ms/LC_MESSAGES/mergeant.mo
 share/locale/nl/LC_MESSAGES/mergeant.mo
 share/locale/no/LC_MESSAGES/mergeant.mo
 share/locale/pl/LC_MESSAGES/mergeant.mo
+share/locale/pt/LC_MESSAGES/mergeant.mo
 share/locale/pt_BR/LC_MESSAGES/mergeant.mo
 share/locale/ru/LC_MESSAGES/mergeant.mo
 share/locale/sk/LC_MESSAGES/mergeant.mo
 share/locale/sv/LC_MESSAGES/mergeant.mo
 share/locale/tr/LC_MESSAGES/mergeant.mo
+share/locale/uk/LC_MESSAGES/mergeant.mo
 share/locale/vi/LC_MESSAGES/mergeant.mo
 @dirrm share/gnome/pixmaps/mergeant
 @dirrm share/gnome/omf/mergeant