3 files changed, 63 insertions, 17 deletions

diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index d8b986925b26..d86390b8e24a 100644
--- a/databases/libgda4/Makefile
+++ b/databases/libgda4/Makefile
@@ -7,7 +7,7 @@
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.2.2
+PORTVERSION?=	4.2.5
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
@@ -41,8 +41,7 @@ CONFIGURE_ARGS=	--without-oracle \
 		--disable-crypto \
 		--enable-introspection=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
-		LIBS="-L${LOCALBASE}/lib -lintl" \
-		ac_cv_path_MYSQL_CONFIG=${LOCALBASE}/bin/mysql_config
+		LIBS="-L${LOCALBASE}/lib -lintl"
 
 .if ${LIBGDA4_SLAVE}=="no"
 OPTIONS=	UI "Build UI tools" on
@@ -52,7 +51,7 @@ OPTIONS=	UI "Build UI tools" on
 INSTALLS_ICONS=	yes
 .endif
 
-.include <bsd.port.pre.mk>
+.include <bsd.port.options.mk>
 
 #VERSION=	${PORTVERSION:R}
 VERSION=	4.0
@@ -113,11 +112,6 @@ CONFIGURE_ARGS+=	--without-mdb
 .if ${LIBGDA4_SLAVE}=="jdbc"
 USE_JAVA=		yes
 JAVA_VENDOR=		bsdjava openjdk
-.if ${OSVERSION} < 700000
-BROKEN=		does not configure on 6.x
-.elif ${OSVERSION} < 800000
-BROKEN=		does not compile on 7.x
-.endif
 .else
 CONFIGURE_ARGS+=	--without-java
 .endif
@@ -125,10 +119,10 @@ CONFIGURE_ARGS+=	--without-java
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldl||g' \
 	    	${WRKSRC}/configure
-	@${REINPLACE_CMD} -e 's|include/db.h|include/db${BDB_VER}/db.h|g' \
-		-e 's|ldb47|ldb${BDB_VER}|g' \
-		-e 's|ldb|ldb${BDB_VER}|g' \
-		-e 's|libdb|libdb${BDB_VER}|g' \
+	@${REINPLACE_CMD} -e 's|"db.h|"db${BDB_VER}/db.h|g' \
+		-e 's|ldb47|l${BDB_LIB_NAME}|g' \
+		-e 's|ldb|l${BDB_LIB_NAME}|g' \
+		-e 's|libdb|lib${BDB_LIB_NAME}|g' \
 		${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|<db\.h>|<db${BDB_VER}/db.h>|' \
 	    	${WRKSRC}/providers/bdb/gda-bdb-provider.c \
@@ -156,5 +150,11 @@ post-install:
 		${PREFIX}/etc/libgda-${VERSION}/config.default
 .endif
 
+.include <bsd.port.pre.mk>
+
+.if ${LIBGDA4_SLAVE}=="jdbc" && ${OSVERSION} < 800000
+BROKEN=		does not compile on 7.x
+.endif
+
 .include <bsd.port.post.mk>
 .endif
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 4481aa1529a4..085cf929c882 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,2 +1,2 @@
-SHA256 (gnome2/libgda-4.2.2.tar.bz2) = 7d0bfca2eda3158fb44ff05890aabd79e6e4b357a03574eacf380dc03bcb9d87
-SIZE (gnome2/libgda-4.2.2.tar.bz2) = 14091997
+SHA256 (gnome2/libgda-4.2.5.tar.bz2) = b98d6063469a1ba8226d94800732544be629c55132516de741c937e8bf175f13
+SIZE (gnome2/libgda-4.2.5.tar.bz2) = 15196398
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index b1851a57937e..db9ec732dc26 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -115,6 +115,7 @@ 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
@@ -180,20 +181,31 @@ 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/table-insert-data.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
@@ -203,20 +215,31 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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/table-insert-data.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
@@ -226,17 +249,28 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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
@@ -249,17 +283,28 @@ libdata/pkgconfig/libgda-xslt-%%VERSION%%.pc
 %%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
@@ -335,6 +380,7 @@ 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