Update to 4.2.8.

Switch to XZ.
Add ldap provider (read only for now).


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

4 files changed, 65 insertions, 6 deletions

diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 48a1cdfb7..d4ff82303 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -3,11 +3,11 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/libgda4/Makefile,v 1.17 2011/04/30 20:43:13 mezz Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.18 2011/05/14 08:17:22 kwm Exp $
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.2.7
+PORTVERSION?=	4.2.8
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -20,7 +20,7 @@ COMMENT?=	Provides uniform access to different kinds of data sources
 
 CONFLICTS=	libgda5-ui-*
 
-USE_BZIP2=	yes
+USE_XZ=		yes
 LIBGDA4_SLAVE?=	no
 
 .if !defined(REFERENCE_PORT)
@@ -82,6 +82,13 @@ CONFIGURE_ARGS+=	--with-bdb=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-bdb
 .endif
 
+.if ${LIBGDA4_SLAVE}=="ldap"
+USE_OPENLDAP=	yes
+CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
+.else
+CONFIGURE_ARGS+=	--without-ldap
+.endif
+
 .if ${LIBGDA4_SLAVE}=="mysql"
 USE_MYSQL=		yes
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
@@ -131,7 +138,7 @@ post-patch:
 		${WRKSRC}/providers/bdb/gda-bdb-test.c
 .if ${LIBGDA4_SLAVE}!="no"
 #. for d in msql firebird odbc freetds mdb ldap mysql sqlite postgres
-. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql
+. for d in bdb jdbc mdb mysql postgres reuseable/postgres reuseable/mysql ldap
 	@${REINPLACE_CMD} -e 's|$$(top_builddir)/libgda/libgda-4.0.la|${LOCALBASE}/lib/libgda-4.0.la|g' \
 		${WRKSRC}/providers/${d}/Makefile.in
 . endfor
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index ccb94819c..0c408b76a 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgda-4.2.7.tar.bz2) = 0c95d2ae4563bbb024c9179a20e95a4b544a7d4fc687ca79ac6b33c5adc113d5
-SIZE (gnome2/libgda-4.2.7.tar.bz2) = 12636540
+SHA256 (gnome2/libgda-4.2.8.tar.xz) = ffb838b8e05d4c7c869461795bb97c90dd859f8be794660b257d8e614a679da9
+SIZE (gnome2/libgda-4.2.8.tar.xz) = 11118668
diff --git a/databases/libgda4/files/patch-tools_browser_schema-browser_table-columns.c b/databases/libgda4/files/patch-tools_browser_schema-browser_table-columns.c
new file mode 100644
index 000000000..fdb7b1fb5
--- /dev/null
+++ b/databases/libgda4/files/patch-tools_browser_schema-browser_table-columns.c
@@ -0,0 +1,17 @@
+--- tools/browser/schema-browser/table-columns.c.orig	2011-06-02 16:36:04.000000000 +0200
++++ tools/browser/schema-browser/table-columns.c	2011-06-02 16:38:00.000000000 +0200
+@@ -117,12 +117,14 @@
+ {
+ 	TableColumns *tcolumns = (TableColumns *) widget;
+         GTK_WIDGET_CLASS (parent_class)->show_all (widget);
++#ifdef HAVE_LDAP
+ 	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/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index fa84a9d9f..785eee363 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -200,6 +200,10 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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/ldap-browser-persp.png
+%%UI%%share/gnome/help/gda-browser/C/figures/ldap-classes.png
+%%UI%%share/gnome/help/gda-browser/C/figures/ldap-search.png
+%%UI%%share/gnome/help/gda-browser/C/figures/ldap-table-mapping.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
@@ -214,6 +218,8 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%UI%%share/gnome/help/gda-browser/C/figures/virtual-cnc.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/ldap-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/C/ldap-connections.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
@@ -240,6 +246,10 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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/ldap-browser-persp.png
+%%UI%%share/gnome/help/gda-browser/de/figures/ldap-classes.png
+%%UI%%share/gnome/help/gda-browser/de/figures/ldap-search.png
+%%UI%%share/gnome/help/gda-browser/de/figures/ldap-table-mapping.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
@@ -254,6 +264,8 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%UI%%share/gnome/help/gda-browser/de/figures/virtual-cnc.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/ldap-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/de/ldap-connections.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
@@ -280,6 +292,10 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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/ldap-browser-persp.png
+%%UI%%share/gnome/help/gda-browser/es/figures/ldap-classes.png
+%%UI%%share/gnome/help/gda-browser/es/figures/ldap-search.png
+%%UI%%share/gnome/help/gda-browser/es/figures/ldap-table-mapping.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
@@ -294,6 +310,8 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%UI%%share/gnome/help/gda-browser/es/figures/virtual-cnc.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/ldap-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/es/ldap-connections.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
@@ -320,6 +338,10 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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/ldap-browser-persp.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-classes.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-search.png
+%%UI%%share/gnome/help/gda-browser/sl/figures/ldap-table-mapping.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
@@ -334,6 +356,8 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%UI%%share/gnome/help/gda-browser/sl/figures/virtual-cnc.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/ldap-browser-perspective.page
+%%UI%%share/gnome/help/gda-browser/sl/ldap-connections.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
@@ -380,12 +404,15 @@ share/libgda-%%VERSION%%/dtd/libgda-server-operation.dtd
 %%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/table-add.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/32x32/actions/ldap-entries.png
+%%UI%%share/libgda-%%VERSION%%/icons/hicolor/32x32/actions/table-add.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
@@ -418,6 +445,14 @@ share/libgda-%%VERSION%%/php/gda-worker.php
 %%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-ldap-class-a.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-s.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-u.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-class-x.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-entry.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-group.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-organization.png
+%%UI%%share/libgda-%%VERSION%%/pixmaps/gda-browser-ldap-person.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