Both libgda4 and libgda5:

Enable Gobject-introspection.
Kill off popt depend doesn't seem to be used.

libgda5:
Add forgotten patch to fix the build of libgda5-ui.
Remove unused plist file.
Major plist fixes for libgda5-ui.


git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@16081 df743ca5-7f9a-e211-a948-0013205c9059

8 files changed, 164 insertions, 547 deletions

diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 0c77e358e..6366a0d87 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4/Makefile,v 1.19 2011/06/02 15:43:38 kwm Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.20 2011/06/11 19:51:10 mezz Exp $
 #
 
 PORTNAME=	libgda4
 PORTVERSION?=	4.2.8
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/4$//}/${PORTVERSION:R}
@@ -26,8 +26,7 @@ LIBGDA4_SLAVE?=	no
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		gcrypt.17:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt.17:${PORTSDIR}/security/libgcrypt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -41,7 +40,7 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
-		--enable-introspection=no
+		--enable-introspection
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib -lintl"
 
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index 785eee363..391c56a6e 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -143,6 +143,8 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
+lib/girepository-1.0/Gda-%%VERSION%%.typelib
+%%UI%%lib/girepository-1.0/Gdaui-%%VERSION%%.typelib
 lib/libgda-%%VERSION%%.a
 lib/libgda-%%VERSION%%.la
 lib/libgda-%%VERSION%%.so
@@ -181,6 +183,8 @@ libdata/pkgconfig/libgda-web-%%VERSION%%.pc
 libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%UI%%share/applications/gda-browser-%%VERSION%%.desktop
 %%UI%%share/applications/gda-control-center-%%VERSION%%.desktop
+share/gir-1.0/Gda-%%VERSION%%.gir
+%%UI%%share/gir-1.0/Gdaui-%%VERSION%%.gir
 %%UI%%share/gnome/help/gda-browser/C/actions.page
 %%UI%%share/gnome/help/gda-browser/C/data-manager-perspective.page
 %%UI%%share/gnome/help/gda-browser/C/data-manager-source-editor.page
diff --git a/databases/libgda5-ui/Makefile b/databases/libgda5-ui/Makefile
index 9d230ac05..d3e041740 100644
--- a/databases/libgda5-ui/Makefile
+++ b/databases/libgda5-ui/Makefile
@@ -3,10 +3,10 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda5-ui/Makefile,v 1.1 2011/03/30 19:23:04 kwm Exp $
+#   $MCom: ports/databases/libgda5-ui/Makefile,v 1.2 2011/06/11 19:51:11 mezz Exp $
 #
 
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 PKGNAMESUFFIX?=	-ui
 
diff --git a/databases/libgda5-ui/pkg-plist b/databases/libgda5-ui/pkg-plist
index 1ad794d27..8cfd0921a 100644
--- a/databases/libgda5-ui/pkg-plist
+++ b/databases/libgda5-ui/pkg-plist
@@ -26,6 +26,7 @@ include/libgda-%%VERSION%%/libgda-ui/gdaui-rt-editor.h
 include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
 include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
 include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
+lib/girepository-1.0/Gdaui-%%VERSION%%.typelib
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
 lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
@@ -41,6 +42,7 @@ lib/libgda-ui-%%VERSION%%.so.5
 libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
 share/applications/gda-browser-%%VERSION%%.desktop
 share/applications/gda-control-center-%%VERSION%%.desktop
+share/gir-1.0/Gdaui-%%VERSION%%.gir
 share/gnome/help/gda-browser/C/actions.page
 share/gnome/help/gda-browser/C/data-manager-perspective.page
 share/gnome/help/gda-browser/C/data-manager-source-editor.page
@@ -60,6 +62,10 @@ share/gnome/help/gda-browser/C/figures/data-man-xmlcompose.png
 share/gnome/help/gda-browser/C/figures/declaredfk-dialog.png
 share/gnome/help/gda-browser/C/figures/declaredfk.png
 share/gnome/help/gda-browser/C/figures/diagram.png
+share/gnome/help/gda-browser/C/figures/ldap-browser-persp.png
+share/gnome/help/gda-browser/C/figures/ldap-classes.png
+share/gnome/help/gda-browser/C/figures/ldap-search.png
+share/gnome/help/gda-browser/C/figures/ldap-table-mapping.png
 share/gnome/help/gda-browser/C/figures/mainwin.png
 share/gnome/help/gda-browser/C/figures/query-exec-persp.png
 share/gnome/help/gda-browser/C/figures/schema-browser-persp.png
@@ -67,14 +73,22 @@ share/gnome/help/gda-browser/C/figures/table-insert-data.png
 share/gnome/help/gda-browser/C/figures/trans-begin.png
 share/gnome/help/gda-browser/C/figures/trans-commit.png
 share/gnome/help/gda-browser/C/figures/trans-rollback.png
+share/gnome/help/gda-browser/C/figures/virtual-cnc-2.png
+share/gnome/help/gda-browser/C/figures/virtual-cnc-3.png
+share/gnome/help/gda-browser/C/figures/virtual-cnc-4.png
+share/gnome/help/gda-browser/C/figures/virtual-cnc-5.png
+share/gnome/help/gda-browser/C/figures/virtual-cnc.png
 share/gnome/help/gda-browser/C/general-ui.page
 share/gnome/help/gda-browser/C/index.page
+share/gnome/help/gda-browser/C/ldap-browser-perspective.page
+share/gnome/help/gda-browser/C/ldap-connections.page
 share/gnome/help/gda-browser/C/legal.xml
 share/gnome/help/gda-browser/C/query-execution-perspective.page
 share/gnome/help/gda-browser/C/schema-browser-perspective.page
 share/gnome/help/gda-browser/C/table-insert-data.page
 share/gnome/help/gda-browser/C/transactions.page
 share/gnome/help/gda-browser/C/variables.page
+share/gnome/help/gda-browser/C/virtual-connections.page
 share/gnome/help/gda-browser/de/actions.page
 share/gnome/help/gda-browser/de/data-manager-perspective.page
 share/gnome/help/gda-browser/de/data-manager-source-editor.page
@@ -94,6 +108,10 @@ share/gnome/help/gda-browser/de/figures/data-man-xmlcompose.png
 share/gnome/help/gda-browser/de/figures/declaredfk-dialog.png
 share/gnome/help/gda-browser/de/figures/declaredfk.png
 share/gnome/help/gda-browser/de/figures/diagram.png
+share/gnome/help/gda-browser/de/figures/ldap-browser-persp.png
+share/gnome/help/gda-browser/de/figures/ldap-classes.png
+share/gnome/help/gda-browser/de/figures/ldap-search.png
+share/gnome/help/gda-browser/de/figures/ldap-table-mapping.png
 share/gnome/help/gda-browser/de/figures/mainwin.png
 share/gnome/help/gda-browser/de/figures/query-exec-persp.png
 share/gnome/help/gda-browser/de/figures/schema-browser-persp.png
@@ -101,14 +119,22 @@ share/gnome/help/gda-browser/de/figures/table-insert-data.png
 share/gnome/help/gda-browser/de/figures/trans-begin.png
 share/gnome/help/gda-browser/de/figures/trans-commit.png
 share/gnome/help/gda-browser/de/figures/trans-rollback.png
+share/gnome/help/gda-browser/de/figures/virtual-cnc-2.png
+share/gnome/help/gda-browser/de/figures/virtual-cnc-3.png
+share/gnome/help/gda-browser/de/figures/virtual-cnc-4.png
+share/gnome/help/gda-browser/de/figures/virtual-cnc-5.png
+share/gnome/help/gda-browser/de/figures/virtual-cnc.png
 share/gnome/help/gda-browser/de/general-ui.page
 share/gnome/help/gda-browser/de/index.page
+share/gnome/help/gda-browser/de/ldap-browser-perspective.page
+share/gnome/help/gda-browser/de/ldap-connections.page
 share/gnome/help/gda-browser/de/legal.xml
 share/gnome/help/gda-browser/de/query-execution-perspective.page
 share/gnome/help/gda-browser/de/schema-browser-perspective.page
 share/gnome/help/gda-browser/de/table-insert-data.page
 share/gnome/help/gda-browser/de/transactions.page
 share/gnome/help/gda-browser/de/variables.page
+share/gnome/help/gda-browser/de/virtual-connections.page
 share/gnome/help/gda-browser/es/actions.page
 share/gnome/help/gda-browser/es/data-manager-perspective.page
 share/gnome/help/gda-browser/es/data-manager-source-editor.page
@@ -128,6 +154,10 @@ share/gnome/help/gda-browser/es/figures/data-man-xmlcompose.png
 share/gnome/help/gda-browser/es/figures/declaredfk-dialog.png
 share/gnome/help/gda-browser/es/figures/declaredfk.png
 share/gnome/help/gda-browser/es/figures/diagram.png
+share/gnome/help/gda-browser/es/figures/ldap-browser-persp.png
+share/gnome/help/gda-browser/es/figures/ldap-classes.png
+share/gnome/help/gda-browser/es/figures/ldap-search.png
+share/gnome/help/gda-browser/es/figures/ldap-table-mapping.png
 share/gnome/help/gda-browser/es/figures/mainwin.png
 share/gnome/help/gda-browser/es/figures/query-exec-persp.png
 share/gnome/help/gda-browser/es/figures/schema-browser-persp.png
@@ -135,14 +165,22 @@ share/gnome/help/gda-browser/es/figures/table-insert-data.png
 share/gnome/help/gda-browser/es/figures/trans-begin.png
 share/gnome/help/gda-browser/es/figures/trans-commit.png
 share/gnome/help/gda-browser/es/figures/trans-rollback.png
+share/gnome/help/gda-browser/es/figures/virtual-cnc-2.png
+share/gnome/help/gda-browser/es/figures/virtual-cnc-3.png
+share/gnome/help/gda-browser/es/figures/virtual-cnc-4.png
+share/gnome/help/gda-browser/es/figures/virtual-cnc-5.png
+share/gnome/help/gda-browser/es/figures/virtual-cnc.png
 share/gnome/help/gda-browser/es/general-ui.page
 share/gnome/help/gda-browser/es/index.page
+share/gnome/help/gda-browser/es/ldap-browser-perspective.page
+share/gnome/help/gda-browser/es/ldap-connections.page
 share/gnome/help/gda-browser/es/legal.xml
 share/gnome/help/gda-browser/es/query-execution-perspective.page
 share/gnome/help/gda-browser/es/schema-browser-perspective.page
 share/gnome/help/gda-browser/es/table-insert-data.page
 share/gnome/help/gda-browser/es/transactions.page
 share/gnome/help/gda-browser/es/variables.page
+share/gnome/help/gda-browser/es/virtual-connections.page
 share/gnome/help/gda-browser/sl/actions.page
 share/gnome/help/gda-browser/sl/data-manager-perspective.page
 share/gnome/help/gda-browser/sl/data-manager-source-editor.page
@@ -162,6 +200,10 @@ share/gnome/help/gda-browser/sl/figures/data-man-xmlcompose.png
 share/gnome/help/gda-browser/sl/figures/declaredfk-dialog.png
 share/gnome/help/gda-browser/sl/figures/declaredfk.png
 share/gnome/help/gda-browser/sl/figures/diagram.png
+share/gnome/help/gda-browser/sl/figures/ldap-browser-persp.png
+share/gnome/help/gda-browser/sl/figures/ldap-classes.png
+share/gnome/help/gda-browser/sl/figures/ldap-search.png
+share/gnome/help/gda-browser/sl/figures/ldap-table-mapping.png
 share/gnome/help/gda-browser/sl/figures/mainwin.png
 share/gnome/help/gda-browser/sl/figures/query-exec-persp.png
 share/gnome/help/gda-browser/sl/figures/schema-browser-persp.png
@@ -169,14 +211,68 @@ share/gnome/help/gda-browser/sl/figures/table-insert-data.png
 share/gnome/help/gda-browser/sl/figures/trans-begin.png
 share/gnome/help/gda-browser/sl/figures/trans-commit.png
 share/gnome/help/gda-browser/sl/figures/trans-rollback.png
+share/gnome/help/gda-browser/sl/figures/virtual-cnc-2.png
+share/gnome/help/gda-browser/sl/figures/virtual-cnc-3.png
+share/gnome/help/gda-browser/sl/figures/virtual-cnc-4.png
+share/gnome/help/gda-browser/sl/figures/virtual-cnc-5.png
+share/gnome/help/gda-browser/sl/figures/virtual-cnc.png
 share/gnome/help/gda-browser/sl/general-ui.page
 share/gnome/help/gda-browser/sl/index.page
+share/gnome/help/gda-browser/sl/ldap-browser-perspective.page
+share/gnome/help/gda-browser/sl/ldap-connections.page
 share/gnome/help/gda-browser/sl/legal.xml
 share/gnome/help/gda-browser/sl/query-execution-perspective.page
 share/gnome/help/gda-browser/sl/schema-browser-perspective.page
 share/gnome/help/gda-browser/sl/table-insert-data.page
 share/gnome/help/gda-browser/sl/transactions.page
 share/gnome/help/gda-browser/sl/variables.page
+share/gnome/help/gda-browser/sl/virtual-connections.page
+share/gnome/help/gda-browser/zh_CN/actions.page
+share/gnome/help/gda-browser/zh_CN/data-manager-perspective.page
+share/gnome/help/gda-browser/zh_CN/data-manager-source-editor.page
+share/gnome/help/gda-browser/zh_CN/data-manager-xml-syntax.page
+share/gnome/help/gda-browser/zh_CN/declaredfk.page
+share/gnome/help/gda-browser/zh_CN/diagram.page
+share/gnome/help/gda-browser/zh_CN/features.page
+share/gnome/help/gda-browser/zh_CN/figures/action-1.png
+share/gnome/help/gda-browser/zh_CN/figures/action-2.png
+share/gnome/help/gda-browser/zh_CN/figures/action-3.png
+share/gnome/help/gda-browser/zh_CN/figures/action-4.png
+share/gnome/help/gda-browser/zh_CN/figures/cnc_open.png
+share/gnome/help/gda-browser/zh_CN/figures/data-man-mode.png
+share/gnome/help/gda-browser/zh_CN/figures/data-man-persp.png
+share/gnome/help/gda-browser/zh_CN/figures/data-man-uicompose.png
+share/gnome/help/gda-browser/zh_CN/figures/data-man-xmlcompose.png
+share/gnome/help/gda-browser/zh_CN/figures/declaredfk-dialog.png
+share/gnome/help/gda-browser/zh_CN/figures/declaredfk.png
+share/gnome/help/gda-browser/zh_CN/figures/diagram.png
+share/gnome/help/gda-browser/zh_CN/figures/ldap-browser-persp.png
+share/gnome/help/gda-browser/zh_CN/figures/ldap-classes.png
+share/gnome/help/gda-browser/zh_CN/figures/ldap-search.png
+share/gnome/help/gda-browser/zh_CN/figures/ldap-table-mapping.png
+share/gnome/help/gda-browser/zh_CN/figures/mainwin.png
+share/gnome/help/gda-browser/zh_CN/figures/query-exec-persp.png
+share/gnome/help/gda-browser/zh_CN/figures/schema-browser-persp.png
+share/gnome/help/gda-browser/zh_CN/figures/table-insert-data.png
+share/gnome/help/gda-browser/zh_CN/figures/trans-begin.png
+share/gnome/help/gda-browser/zh_CN/figures/trans-commit.png
+share/gnome/help/gda-browser/zh_CN/figures/trans-rollback.png
+share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-2.png
+share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-3.png
+share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-4.png
+share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc-5.png
+share/gnome/help/gda-browser/zh_CN/figures/virtual-cnc.png
+share/gnome/help/gda-browser/zh_CN/general-ui.page
+share/gnome/help/gda-browser/zh_CN/index.page
+share/gnome/help/gda-browser/zh_CN/ldap-browser-perspective.page
+share/gnome/help/gda-browser/zh_CN/ldap-connections.page
+share/gnome/help/gda-browser/zh_CN/legal.xml
+share/gnome/help/gda-browser/zh_CN/query-execution-perspective.page
+share/gnome/help/gda-browser/zh_CN/schema-browser-perspective.page
+share/gnome/help/gda-browser/zh_CN/table-insert-data.page
+share/gnome/help/gda-browser/zh_CN/transactions.page
+share/gnome/help/gda-browser/zh_CN/variables.page
+share/gnome/help/gda-browser/zh_CN/virtual-connections.page
 share/icons/hicolor/16x16/apps/gda-control-center.png
 share/icons/hicolor/22x22/apps/gda-control-center.png
 share/icons/hicolor/24x24/apps/gda-control-center.png
@@ -214,12 +310,15 @@ share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
+share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/table-add.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
 share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
 share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
 share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
 share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
+share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/ldap-entries.png
+share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/table-add.png
 share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
 share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
 share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
@@ -240,6 +339,14 @@ share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-a.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-s.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-u.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-x.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-entry.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-group.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-organization.png
+share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-person.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
 share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
@@ -255,9 +362,33 @@ share/libgda-%%VERSION%%/server_operation.glade
 share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
 share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
 share/pixmaps/gda-browser-%%VERSION%%.png
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32/actions
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24/actions
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22/actions
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16/actions
+@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16
+@dirrm share/libgda-%%VERSION%%/icons/hicolor
+@dirrm share/libgda-%%VERSION%%/icons
+@dirrm share/gnome/help/gda-browser/zh_CN/figures
+@dirrm share/gnome/help/gda-browser/zh_CN
+@dirrm share/gnome/help/gda-browser/sl/figures
+@dirrm share/gnome/help/gda-browser/sl
+@dirrm share/gnome/help/gda-browser/es/figures
+@dirrm share/gnome/help/gda-browser/es
+@dirrm share/gnome/help/gda-browser/de/figures
+@dirrm share/gnome/help/gda-browser/de
+@dirrm share/gnome/help/gda-browser/C/figures
+@dirrm share/gnome/help/gda-browser/C
+@dirrm share/gnome/help/gda-browser
 @dirrm share/libgda-%%VERSION%%/ui
 @dirrm share/libgda-%%VERSION%%/pixmaps
 @dirrm share/libgda-%%VERSION%%/language-specs
 @dirrm share/libgda-%%VERSION%%/demo
+@dirrmtry share/applications
 @dirrm lib/libgda-%%VERSION%%/plugins
 @dirrm include/libgda-%%VERSION%%/libgda-ui
diff --git a/databases/libgda5/Makefile b/databases/libgda5/Makefile
index b90f5b64b..3fda85f92 100644
--- a/databases/libgda5/Makefile
+++ b/databases/libgda5/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda5/Makefile,v 1.3 2011/06/02 15:39:39 kwm Exp $
+#   $MCom: ports/databases/libgda5/Makefile,v 1.4 2011/06/11 19:51:11 mezz Exp $
 #
 
 PORTNAME=	libgda5
 PORTVERSION?=	4.99.1
-PORTREVISION?=	0
+PORTREVISION?=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/5$//}/${PORTVERSION:R}
@@ -24,8 +24,7 @@ LIBGDA5_SLAVE?=	no
 .if !defined(REFERENCE_PORT)
 
 BUILD_DEPENDS=	g-ir-scanner:${PORTSDIR}/devel/gobject-introspection
-LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt \
-		gcrypt.17:${PORTSDIR}/security/libgcrypt \
+LIB_DEPENDS=	gcrypt.17:${PORTSDIR}/security/libgcrypt \
     		soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		json-glib-1.0.0:${PORTSDIR}/devel/json-glib
 RUN_DEPENDS=	${LOCALBASE}/lib/girepository-1.0/GObject-2.0.typelib:${PORTSDIR}/devel/gobject-introspection
@@ -39,7 +38,7 @@ GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
 CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
-		--enable-introspection=no
+		--enable-introspection
 CPPFLAGS=	-I${LOCALBASE}/include
 CONFIGURE_ENV=	LDFLAGS="-L${LOCALBASE}/lib"
 
diff --git a/databases/libgda5/files/patch-tools_browser_schema-browser_table-columns.c b/databases/libgda5/files/patch-tools_browser_schema-browser_table-columns.c
new file mode 100644
index 000000000..bff7337d6
--- /dev/null
+++ b/databases/libgda5/files/patch-tools_browser_schema-browser_table-columns.c
@@ -0,0 +1,17 @@
+--- tools/browser/schema-browser/table-columns.c.orig	2011-06-16 20:42:33.000000000 +0200
++++ tools/browser/schema-browser/table-columns.c	2011-06-16 20:42:49.000000000 +0200
+@@ -117,12 +117,14 @@
+ {
+ 	TableColumns *tcolumns = (TableColumns *) widget;
+         GTK_WIDGET_CLASS (parent_class)->show_all (widget);
++#if 0
+ 	if (browser_connection_is_ldap (tcolumns->priv->bcnc)) {
+ 		if (! tcolumns->priv->ldap_props_shown) {
+ 			gtk_widget_hide (tcolumns->priv->ldap_header);
+ 			gtk_widget_hide (tcolumns->priv->ldap_text);
+ 		}
+ 	}
++#endif
+ }
+ 
+ GType
diff --git a/databases/libgda5/pkg-plist b/databases/libgda5/pkg-plist
index 520e13186..82f93f34b 100644
--- a/databases/libgda5/pkg-plist
+++ b/databases/libgda5/pkg-plist
@@ -111,6 +111,7 @@ include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
 include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
 include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
+lib/girepository-1.0/Gda-%%VERSION%%.typelib
 lib/libgda-%%VERSION%%.a
 lib/libgda-%%VERSION%%.la
 lib/libgda-%%VERSION%%.so
@@ -134,6 +135,7 @@ libdata/pkgconfig/libgda-report-%%VERSION%%.pc
 libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
 libdata/pkgconfig/libgda-web-%%VERSION%%.pc
 libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
+share/gir-1.0/Gda-%%VERSION%%.gir
 share/libgda-%%VERSION%%/dtd/libgda-array.dtd
 share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
 share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
diff --git a/databases/libgda5/pkg-plist.ui b/databases/libgda5/pkg-plist.ui
deleted file mode 100644
index 9d9a2e1be..000000000
--- a/databases/libgda5/pkg-plist.ui
+++ /dev/null
@@ -1,535 +0,0 @@
-bin/gda-list-config-%%VERSION%%
-%%UI%%bin/gda-browser-%%VERSION%%
-%%UI%%bin/gda-control-center-%%VERSION%%
-bin/gda-list-server-op-%%VERSION%%
-bin/gda-sql-%%VERSION%%
-bin/gda-test-connection-%%VERSION%%
-bin/gda_trml2html/__init__.py
-bin/gda_trml2html/trml2html.py
-bin/gda_trml2html/utils.py
-bin/gda_trml2pdf/__init__.py
-bin/gda_trml2pdf/color.py
-bin/gda_trml2pdf/trml2pdf.py
-bin/gda_trml2pdf/utils.py
-%%UI%%bin/gdaui-demo-%%VERSION%%
-@unexec if cmp -s %D/etc/libgda-%%VERSION%%/config %D/etc/libgda-%%VERSION%%/config.default; then rm -f %D/etc/libgda-%%VERSION%%/config; fi
-etc/libgda-%%VERSION%%/config.default
-@exec [ -f %B/config ] || cp %B/%f %B/config
-etc/libgda-%%VERSION%%/sales_test.db
-include/libgda-%%VERSION%%/libgda-report/gda-report-docbook-document.h
-include/libgda-%%VERSION%%/libgda-report/gda-report-document.h
-include/libgda-%%VERSION%%/libgda-report/gda-report-engine.h
-include/libgda-%%VERSION%%/libgda-report/gda-report-rml-document.h
-include/libgda-%%VERSION%%/libgda-report/libgda-report.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-basic-form.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-cloud.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-combo.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-cell-renderer-util.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-entry.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-filter.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy-info.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-proxy.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-selector.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-data-store.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-decl.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enum-types.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-enums.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-form.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-grid.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-login.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-plugin.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-provider-selector.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-form.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-raw-grid.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-rt-editor.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-server-operation.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/gdaui-tree-store.h
-%%UI%%include/libgda-%%VERSION%%/libgda-ui/libgda-ui.h
-include/libgda-%%VERSION%%/libgda-xslt/libgda-xslt.h
-include/libgda-%%VERSION%%/libgda/gda-attributes-manager.h
-include/libgda-%%VERSION%%/libgda/gda-batch.h
-include/libgda-%%VERSION%%/libgda/gda-binreloc.h
-include/libgda-%%VERSION%%/libgda/gda-blob-op.h
-include/libgda-%%VERSION%%/libgda/gda-column.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-comparator.h
-include/libgda-%%VERSION%%/libgda/gda-data-handler.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-array.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-dir.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-extra.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-import.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-iter.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-iter-extra.h
-include/libgda-%%VERSION%%/libgda/gda-data-model-private.h
-include/libgda-%%VERSION%%/libgda/gda-data-model.h
-include/libgda-%%VERSION%%/libgda/gda-data-proxy.h
-include/libgda-%%VERSION%%/libgda/gda-data-select.h
-include/libgda-%%VERSION%%/libgda/gda-debug-macros.h
-include/libgda-%%VERSION%%/libgda/gda-decl.h
-include/libgda-%%VERSION%%/libgda/gda-enum-types.h
-include/libgda-%%VERSION%%/libgda/gda-enums.h
-include/libgda-%%VERSION%%/libgda/gda-holder.h
-include/libgda-%%VERSION%%/libgda/gda-lockable.h
-include/libgda-%%VERSION%%/libgda/gda-log.h
-include/libgda-%%VERSION%%/libgda/gda-marshal.h
-include/libgda-%%VERSION%%/libgda/gda-meta-store.h
-include/libgda-%%VERSION%%/libgda/gda-meta-struct.h
-include/libgda-%%VERSION%%/libgda/gda-mutex.h
-include/libgda-%%VERSION%%/libgda/gda-quark-list.h
-include/libgda-%%VERSION%%/libgda/gda-repetitive-statement.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-set.h
-include/libgda-%%VERSION%%/libgda/gda-sql-builder.h
-include/libgda-%%VERSION%%/libgda/gda-statement-extra.h
-include/libgda-%%VERSION%%/libgda/gda-statement.h
-include/libgda-%%VERSION%%/libgda/gda-tree-manager.h
-include/libgda-%%VERSION%%/libgda/gda-tree-mgr-columns.h
-include/libgda-%%VERSION%%/libgda/gda-tree-mgr-label.h
-include/libgda-%%VERSION%%/libgda/gda-tree-mgr-schemas.h
-include/libgda-%%VERSION%%/libgda/gda-tree-mgr-select.h
-include/libgda-%%VERSION%%/libgda/gda-tree-mgr-tables.h
-include/libgda-%%VERSION%%/libgda/gda-tree-node.h
-include/libgda-%%VERSION%%/libgda/gda-tree.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-xa-transaction.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-bin.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-boolean.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-numerical.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-string.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-time.h
-include/libgda-%%VERSION%%/libgda/handlers/gda-handler-type.h
-include/libgda-%%VERSION%%/libgda/libgda.h
-include/libgda-%%VERSION%%/libgda/libgda-global-variables.h
-include/libgda-%%VERSION%%/libgda/providers-support/gda-data-select-priv.h
-include/libgda-%%VERSION%%/libgda/providers-support/gda-meta-column-types.h
-include/libgda-%%VERSION%%/libgda/providers-support/gda-pstmt.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-sql-parser-enum-types.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-sql-parser.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-sql-statement.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-compound.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-decl.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-delete.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-insert.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-parts.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-pspec.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-select.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-trans.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-unknown.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-update.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct-util.h
-include/libgda-%%VERSION%%/libgda/sql-parser/gda-statement-struct.h
-include/libgda-%%VERSION%%/libgda/sqlite/gda-sqlite-provider.h
-include/libgda-%%VERSION%%/libgda/thread-wrapper/gda-thread-wrapper.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-data-model.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-vconnection-hub.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-connection.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-virtual-provider.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-data-model.h
-include/libgda-%%VERSION%%/libgda/virtual/gda-vprovider-hub.h
-include/libgda-%%VERSION%%/libgda/virtual/libgda-virtual.h
-lib/libgda-%%VERSION%%.a
-lib/libgda-%%VERSION%%.la
-lib/libgda-%%VERSION%%.so
-lib/libgda-%%VERSION%%.so.5
-%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-filesel-spec.xml
-%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-password.xml
-%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec.xml
-%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-pict-spec_string.xml
-%%UI%%lib/libgda-%%VERSION%%/plugins/gdaui-entry-text-spec.xml
-%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.a
-%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.la
-%%UI%%lib/libgda-%%VERSION%%/plugins/libgda-ui-plugins.so
-lib/libgda-%%VERSION%%/providers/libgda-web.a
-lib/libgda-%%VERSION%%/providers/libgda-web.la
-lib/libgda-%%VERSION%%/providers/libgda-web.so
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.a
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.la
-lib/libgda-%%VERSION%%/providers/libgda-sqlite.so
-lib/libgda-report-%%VERSION%%.a
-lib/libgda-report-%%VERSION%%.la
-lib/libgda-report-%%VERSION%%.so
-lib/libgda-report-%%VERSION%%.so.5
-%%UI%%lib/libgda-ui-%%VERSION%%.a
-%%UI%%lib/libgda-ui-%%VERSION%%.la
-%%UI%%lib/libgda-ui-%%VERSION%%.so
-%%UI%%lib/libgda-ui-%%VERSION%%.so.5
-lib/libgda-xslt-%%VERSION%%.a
-lib/libgda-xslt-%%VERSION%%.la
-lib/libgda-xslt-%%VERSION%%.so
-lib/libgda-xslt-%%VERSION%%.so.5
-libdata/pkgconfig/libgda-%%VERSION%%.pc
-libdata/pkgconfig/libgda-report-%%VERSION%%.pc
-libdata/pkgconfig/libgda-sqlite-%%VERSION%%.pc
-%%UI%%libdata/pkgconfig/libgda-ui-%%VERSION%%.pc
-libdata/pkgconfig/libgda-web-%%VERSION%%.pc
-libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
-%%UI%%share/applications/gda-browser-%%VERSION%%.desktop
-%%UI%%share/applications/gda-control-center-%%VERSION%%.desktop
-%%UI%%share/gnome/help/gda-browser/C/actions.page
-%%UI%%share/gnome/help/gda-browser/C/data-manager-perspective.page
-%%UI%%share/gnome/help/gda-browser/C/data-manager-source-editor.page
-%%UI%%share/gnome/help/gda-browser/C/data-manager-xml-syntax.page
-%%UI%%share/gnome/help/gda-browser/C/declaredfk.page
-%%UI%%share/gnome/help/gda-browser/C/diagram.page
-%%UI%%share/gnome/help/gda-browser/C/features.page
-%%UI%%share/gnome/help/gda-browser/C/figures/action-1.png
-%%UI%%share/gnome/help/gda-browser/C/figures/action-2.png
-%%UI%%share/gnome/help/gda-browser/C/figures/action-3.png
-%%UI%%share/gnome/help/gda-browser/C/figures/action-4.png
-%%UI%%share/gnome/help/gda-browser/C/figures/cnc_open.png
-%%UI%%share/gnome/help/gda-browser/C/figures/data-man-mode.png
-%%UI%%share/gnome/help/gda-browser/C/figures/data-man-persp.png
-%%UI%%share/gnome/help/gda-browser/C/figures/data-man-uicompose.png
-%%UI%%share/gnome/help/gda-browser/C/figures/data-man-xmlcompose.png
-%%UI%%share/gnome/help/gda-browser/C/figures/declaredfk-dialog.png
-%%UI%%share/gnome/help/gda-browser/C/figures/declaredfk.png
-%%UI%%share/gnome/help/gda-browser/C/figures/diagram.png
-%%UI%%share/gnome/help/gda-browser/C/figures/mainwin.png
-%%UI%%share/gnome/help/gda-browser/C/figures/query-exec-persp.png
-%%UI%%share/gnome/help/gda-browser/C/figures/schema-browser-persp.png
-%%UI%%share/gnome/help/gda-browser/C/figures/table-insert-data.png
-%%UI%%share/gnome/help/gda-browser/C/figures/trans-begin.png
-%%UI%%share/gnome/help/gda-browser/C/figures/trans-commit.png
-%%UI%%share/gnome/help/gda-browser/C/figures/trans-rollback.png
-%%UI%%share/gnome/help/gda-browser/C/general-ui.page
-%%UI%%share/gnome/help/gda-browser/C/index.page
-%%UI%%share/gnome/help/gda-browser/C/legal.xml
-%%UI%%share/gnome/help/gda-browser/C/query-execution-perspective.page
-%%UI%%share/gnome/help/gda-browser/C/schema-browser-perspective.page
-%%UI%%share/gnome/help/gda-browser/C/table-insert-data.page
-%%UI%%share/gnome/help/gda-browser/C/transactions.page
-%%UI%%share/gnome/help/gda-browser/C/variables.page
-%%UI%%share/gnome/help/gda-browser/de/actions.page
-%%UI%%share/gnome/help/gda-browser/de/data-manager-perspective.page
-%%UI%%share/gnome/help/gda-browser/de/data-manager-source-editor.page
-%%UI%%share/gnome/help/gda-browser/de/data-manager-xml-syntax.page
-%%UI%%share/gnome/help/gda-browser/de/declaredfk.page
-%%UI%%share/gnome/help/gda-browser/de/diagram.page
-%%UI%%share/gnome/help/gda-browser/de/features.page
-%%UI%%share/gnome/help/gda-browser/de/figures/action-1.png
-%%UI%%share/gnome/help/gda-browser/de/figures/action-2.png
-%%UI%%share/gnome/help/gda-browser/de/figures/action-3.png
-%%UI%%share/gnome/help/gda-browser/de/figures/action-4.png
-%%UI%%share/gnome/help/gda-browser/de/figures/cnc_open.png
-%%UI%%share/gnome/help/gda-browser/de/figures/data-man-mode.png
-%%UI%%share/gnome/help/gda-browser/de/figures/data-man-persp.png
-%%UI%%share/gnome/help/gda-browser/de/figures/data-man-uicompose.png
-%%UI%%share/gnome/help/gda-browser/de/figures/data-man-xmlcompose.png
-%%UI%%share/gnome/help/gda-browser/de/figures/declaredfk-dialog.png
-%%UI%%share/gnome/help/gda-browser/de/figures/declaredfk.png
-%%UI%%share/gnome/help/gda-browser/de/figures/diagram.png
-%%UI%%share/gnome/help/gda-browser/de/figures/mainwin.png
-%%UI%%share/gnome/help/gda-browser/de/figures/query-exec-persp.png
-%%UI%%share/gnome/help/gda-browser/de/figures/schema-browser-persp.png
-%%UI%%share/gnome/help/gda-browser/de/figures/table-insert-data.png
-%%UI%%share/gnome/help/gda-browser/de/figures/trans-begin.png
-%%UI%%share/gnome/help/gda-browser/de/figures/trans-commit.png
-%%UI%%share/gnome/help/gda-browser/de/figures/trans-rollback.png
-%%UI%%share/gnome/help/gda-browser/de/general-ui.page
-%%UI%%share/gnome/help/gda-browser/de/index.page
-%%UI%%share/gnome/help/gda-browser/de/legal.xml
-%%UI%%share/gnome/help/gda-browser/de/query-execution-perspective.page
-%%UI%%share/gnome/help/gda-browser/de/schema-browser-perspective.page
-%%UI%%share/gnome/help/gda-browser/de/table-insert-data.page
-%%UI%%share/gnome/help/gda-browser/de/transactions.page
-%%UI%%share/gnome/help/gda-browser/de/variables.page
-%%UI%%share/gnome/help/gda-browser/es/actions.page
-%%UI%%share/gnome/help/gda-browser/es/data-manager-perspective.page
-%%UI%%share/gnome/help/gda-browser/es/data-manager-source-editor.page
-%%UI%%share/gnome/help/gda-browser/es/data-manager-xml-syntax.page
-%%UI%%share/gnome/help/gda-browser/es/declaredfk.page
-%%UI%%share/gnome/help/gda-browser/es/diagram.page
-%%UI%%share/gnome/help/gda-browser/es/features.page
-%%UI%%share/gnome/help/gda-browser/es/figures/action-1.png
-%%UI%%share/gnome/help/gda-browser/es/figures/action-2.png
-%%UI%%share/gnome/help/gda-browser/es/figures/action-3.png
-%%UI%%share/gnome/help/gda-browser/es/figures/action-4.png
-%%UI%%share/gnome/help/gda-browser/es/figures/cnc_open.png
-%%UI%%share/gnome/help/gda-browser/es/figures/data-man-mode.png
-%%UI%%share/gnome/help/gda-browser/es/figures/data-man-persp.png
-%%UI%%share/gnome/help/gda-browser/es/figures/data-man-uicompose.png
-%%UI%%share/gnome/help/gda-browser/es/figures/data-man-xmlcompose.png
-%%UI%%share/gnome/help/gda-browser/es/figures/declaredfk-dialog.png
-%%UI%%share/gnome/help/gda-browser/es/figures/declaredfk.png
-%%UI%%share/gnome/help/gda-browser/es/figures/diagram.png
-%%UI%%share/gnome/help/gda-browser/es/figures/mainwin.png
-%%UI%%share/gnome/help/gda-browser/es/figures/query-exec-persp.png
-%%UI%%share/gnome/help/gda-browser/es/figures/schema-browser-persp.png
-%%UI%%share/gnome/help/gda-browser/es/figures/table-insert-data.png
-%%UI%%share/gnome/help/gda-browser/es/figures/trans-begin.png
-%%UI%%share/gnome/help/gda-browser/es/figures/trans-commit.png
-%%UI%%share/gnome/help/gda-browser/es/figures/trans-rollback.png
-%%UI%%share/gnome/help/gda-browser/es/general-ui.page
-%%UI%%share/gnome/help/gda-browser/es/index.page
-%%UI%%share/gnome/help/gda-browser/es/legal.xml
-%%UI%%share/gnome/help/gda-browser/es/query-execution-perspective.page
-%%UI%%share/gnome/help/gda-browser/es/schema-browser-perspective.page
-%%UI%%share/gnome/help/gda-browser/es/table-insert-data.page
-%%UI%%share/gnome/help/gda-browser/es/transactions.page
-%%UI%%share/gnome/help/gda-browser/es/variables.page
-%%UI%%share/gnome/help/gda-browser/sl/actions.page
-%%UI%%share/gnome/help/gda-browser/sl/data-manager-perspective.page
-%%UI%%share/gnome/help/gda-browser/sl/data-manager-source-editor.page
-%%UI%%share/gnome/help/gda-browser/sl/data-manager-xml-syntax.page
-%%UI%%share/gnome/help/gda-browser/sl/declaredfk.page
-%%UI%%share/gnome/help/gda-browser/sl/diagram.page
-%%UI%%share/gnome/help/gda-browser/sl/features.page
-%%UI%%share/gnome/help/gda-browser/sl/figures/action-1.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/action-2.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/action-3.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/action-4.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/cnc_open.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-mode.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-persp.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-uicompose.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/data-man-xmlcompose.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/declaredfk-dialog.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/declaredfk.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/diagram.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/mainwin.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/query-exec-persp.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/schema-browser-persp.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/table-insert-data.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/trans-begin.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/trans-commit.png
-%%UI%%share/gnome/help/gda-browser/sl/figures/trans-rollback.png
-%%UI%%share/gnome/help/gda-browser/sl/general-ui.page
-%%UI%%share/gnome/help/gda-browser/sl/index.page
-%%UI%%share/gnome/help/gda-browser/sl/legal.xml
-%%UI%%share/gnome/help/gda-browser/sl/query-execution-perspective.page
-%%UI%%share/gnome/help/gda-browser/sl/schema-browser-perspective.page
-%%UI%%share/gnome/help/gda-browser/sl/table-insert-data.page
-%%UI%%share/gnome/help/gda-browser/sl/transactions.page
-%%UI%%share/gnome/help/gda-browser/sl/variables.page
-%%UI%%share/icons/hicolor/16x16/apps/gda-control-center.png
-%%UI%%share/icons/hicolor/22x22/apps/gda-control-center.png
-%%UI%%share/icons/hicolor/24x24/apps/gda-control-center.png
-%%UI%%share/icons/hicolor/256x256/apps/gda-control-center.png
-%%UI%%share/icons/hicolor/32x32/apps/gda-control-center.png
-%%UI%%share/icons/hicolor/48x48/apps/gda-control-center.png
-%%UI%%share/libgda-%%VERSION%%/demo/basic_form.c
-%%UI%%share/libgda-%%VERSION%%/demo/cloud.c
-%%UI%%share/libgda-%%VERSION%%/demo/combo.c
-%%UI%%share/libgda-%%VERSION%%/demo/custom_layout.xml
-%%UI%%share/libgda-%%VERSION%%/demo/data_model_dir.c
-%%UI%%share/libgda-%%VERSION%%/demo/ddl_queries.c
-%%UI%%share/libgda-%%VERSION%%/demo/demo_db.db
-%%UI%%share/libgda-%%VERSION%%/demo/form.c
-%%UI%%share/libgda-%%VERSION%%/demo/form_data_layout.c
-%%UI%%share/libgda-%%VERSION%%/demo/form_pict.c
-%%UI%%share/libgda-%%VERSION%%/demo/form_rw.c
-%%UI%%share/libgda-%%VERSION%%/demo/grid.c
-%%UI%%share/libgda-%%VERSION%%/demo/grid_data_layout.c
-%%UI%%share/libgda-%%VERSION%%/demo/grid_pict.c
-%%UI%%share/libgda-%%VERSION%%/demo/grid_rw.c
-%%UI%%share/libgda-%%VERSION%%/demo/linked_grid_form.c
-%%UI%%share/libgda-%%VERSION%%/demo/linked_model_param.c
-%%UI%%share/libgda-%%VERSION%%/demo/login.c
-%%UI%%share/libgda-%%VERSION%%/demo/provider_sel.c
-%%UI%%share/libgda-%%VERSION%%/demo/tree.c
-%%UI%%share/libgda-%%VERSION%%/dtd/gdaui-layout.dtd
-share/libgda-%%VERSION%%/dtd/libgda-array.dtd
-share/libgda-%%VERSION%%/dtd/libgda-paramlist.dtd
-share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/bookmark-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/glade.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/16x16/actions/history-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/bookmark-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/glade.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/22x22/actions/history-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/bookmark-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/glade.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/history-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-begin.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-commit.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/24x24/actions/transaction-rollback.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/bookmark-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/glade.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/history-view.png
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/icon-theme.cache
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/bookmark-view.svg
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/glade.svg
-%%UI%%share/libgda-%%VERSION%%/icons/hicolor/scalable/actions/history-view.svg
-%%UI%%share/libgda-%%VERSION%%/import_encodings.xml
-share/libgda-%%VERSION%%/information_schema.xml
-%%UI%%share/libgda-%%VERSION%%/language-specs/gda-sql.lang
-share/libgda-%%VERSION%%/php/README
-share/libgda-%%VERSION%%/php/gda-clean.php
-share/libgda-%%VERSION%%/php/gda-config.php
-share/libgda-%%VERSION%%/php/gda-exception.php
-share/libgda-%%VERSION%%/php/gda-front.php
-share/libgda-%%VERSION%%/php/gda-meta.php
-share/libgda-%%VERSION%%/php/gda-setup.php
-share/libgda-%%VERSION%%/php/gda-tester.php
-share/libgda-%%VERSION%%/php/gda-utils.php
-share/libgda-%%VERSION%%/php/gda-worker.php
-%%UI%%share/libgda-%%VERSION%%/pixmaps/bin-attachment-16x16.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-action.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth-big.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-auth.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-bookmark.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fk.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-fknn.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-nn.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column-pk.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-column.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected-big.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-connected.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-diagram.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-form.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-grid.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-menu-ind.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected-big.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-non-connected.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-query.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-reference.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-schema.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-table.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center-newcnc.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-control-center.png
-%%UI%%share/libgda-%%VERSION%%/pixmaps/gdaui-generic.png
-%%UI%%share/libgda-%%VERSION%%/server_operation.glade
-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_create_view.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_drop_view.xml
-share/libgda-%%VERSION%%/sqlite_specs_dsn.xml
-share/libgda-%%VERSION%%/sqlite_specs_rename_table.xml
-%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-number.xml
-%%UI%%share/libgda-%%VERSION%%/ui/gdaui-entry-string.xml
-share/libgda-%%VERSION%%/web_specs_auth.xml
-share/libgda-%%VERSION%%/web_specs_dsn.xml
-share/libgda-%%VERSION%%/web/cnc.js
-share/libgda-%%VERSION%%/web/gda-print.css
-share/libgda-%%VERSION%%/web/gda.css
-share/libgda-%%VERSION%%/web/irb.css
-share/libgda-%%VERSION%%/web/irb.js
-share/libgda-%%VERSION%%/web/jquery.js
-share/libgda-%%VERSION%%/web/md5.js
-share/libgda-%%VERSION%%/web/mouseapp_2.js
-share/libgda-%%VERSION%%/web/mouseirb_2.js
-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/ca@valencia/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/id/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/mk/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/oc/LC_MESSAGES/libgda-%%VERSION%%.mo
-share/locale/pa/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
-%%UI%%share/pixmaps/gda-browser-%%VERSION%%.png
-@dirrm share/libgda-%%VERSION%%/web
-%%UI%%@dirrm share/libgda-%%VERSION%%/ui
-%%UI%%@dirrm share/libgda-%%VERSION%%/pixmaps
-@dirrm share/libgda-%%VERSION%%/php
-%%UI%%@dirrm share/libgda-%%VERSION%%/language-specs
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable/actions
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/scalable
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32/actions
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/32x32
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24/actions
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/24x24
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22/actions
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/22x22
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16/actions
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor/16x16
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons/hicolor
-%%UI%%@dirrm share/libgda-%%VERSION%%/icons
-%%UI%%@dirrm share/gnome/help/gda-browser/sl/figures
-%%UI%%@dirrm share/gnome/help/gda-browser/sl
-%%UI%%@dirrm share/gnome/help/gda-browser/es/figures
-%%UI%%@dirrm share/gnome/help/gda-browser/es
-%%UI%%@dirrm share/gnome/help/gda-browser/de/figures
-%%UI%%@dirrm share/gnome/help/gda-browser/de
-%%UI%%@dirrm share/gnome/help/gda-browser/C/figures
-%%UI%%@dirrm share/gnome/help/gda-browser/C
-%%UI%%@dirrm share/gnome/help/gda-browser
-@dirrm share/libgda-%%VERSION%%/dtd
-%%UI%%@dirrm share/libgda-%%VERSION%%/demo
-@dirrm share/libgda-%%VERSION%%/
-%%UI%%@dirrmtry share/applications
-@dirrm lib/libgda-%%VERSION%%/providers
-%%UI%%@dirrm lib/libgda-%%VERSION%%/plugins
-@dirrm lib/libgda-%%VERSION%%
-@dirrm include/libgda-%%VERSION%%/libgda/virtual
-@dirrm include/libgda-%%VERSION%%/libgda/thread-wrapper
-@dirrm include/libgda-%%VERSION%%/libgda/sqlite
-@dirrm include/libgda-%%VERSION%%/libgda/sql-parser
-@dirrm include/libgda-%%VERSION%%/libgda/providers-support
-@dirrm include/libgda-%%VERSION%%/libgda/handlers
-@dirrm include/libgda-%%VERSION%%/libgda-xslt
-%%UI%%@dirrm include/libgda-%%VERSION%%/libgda-ui
-@dirrm include/libgda-%%VERSION%%/libgda-report
-@dirrm include/libgda-%%VERSION%%/libgda
-@dirrm include/libgda-%%VERSION%%
-@dirrmtry etc/libgda-%%VERSION%%
-@dirrm bin/gda_trml2pdf
-@dirrm bin/gda_trml2html
-@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/oc/LC_MESSAGES
-@dirrmtry share/locale/oc
-@dirrmtry share/locale/dz/LC_MESSAGES
-@dirrmtry share/locale/dz
-@dirrmtry share/locale/ca@valencia/LC_MESSAGES
-@dirrmtry share/locale/ca@valencia