3 files changed, 23 insertions, 24 deletions

diff --git a/databases/libgda3/Makefile b/databases/libgda3/Makefile
index 2d1e8227c901..0f8799e503b4 100644
--- a/databases/libgda3/Makefile
+++ b/databases/libgda3/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	libgda2
-PORTVERSION=	0.11.0
-PORTREVISION=	1
+PORTVERSION=	0.12.0
 CATEGORIES=	databases gnome
 MASTER_SITES=	${MASTER_SITE_GNOME}
-MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.11
+MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/2$//}/0.12
 DISTNAME=	libgda-${PORTVERSION}
 DIST_SUBDIR=	gnome2
 
@@ -28,6 +27,7 @@ USE_REINPLACE=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomehier glib20 libxslt
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ARGS=	--without-odbc # iODBC support seems broken
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
 
@@ -35,34 +35,34 @@ MAN1=		gda-config-tool.1
 MAN5=		gda-config.5
 
 .if defined(WITH_MYSQL)
-LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
+LIB_DEPENDS+=		mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 CONFIGURE_ARGS+=	--with-mysql=${LOCALBASE}
-PLIST_SUB=	MYSQL=""
+PLIST_SUB=		MYSQL=""
 .else
 CONFIGURE_ARGS+=	--without-mysql
-PLIST_SUB=	MYSQL="@comment "
+PLIST_SUB=		MYSQL="@comment "
 .endif
 
 .if defined(WITH_POSTGRES)
 POSTGRESQL_PORT?=	databases/postgresql7
-LIB_DEPENDS+=	pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
+LIB_DEPENDS+=		pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
 CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
-PLIST_SUB+=	POSTGRES=""
+PLIST_SUB+=		POSTGRES=""
 .else
 CONFIGURE_ARGS+=	--without-postgres
-PLIST_SUB+=	POSTGRES="@comment "
+PLIST_SUB+=		POSTGRES="@comment "
 .endif
 
 .if defined(WITH_LDAP)
-LIB_DEPENDS+=	ldap.2:${PORTSDIR}/net/openldap20
+LIB_DEPENDS+=		ldap.2:${PORTSDIR}/net/openldap20
 CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-PLIST_SUB+=	LDAP=""
+PLIST_SUB+=		LDAP=""
 .else
 CONFIGURE_ARGS+=	--without-ldap
-PLIST_SUB+=	LDAP="@comment "
+PLIST_SUB+=		LDAP="@comment "
 .endif
 
-pre-extract:
+pre-everything::
 .if !defined(WITH_MYSQL)
 	@${ECHO_MSG} "You can enable support for MySQL databases by defining WITH_MYSQL."
 .endif
diff --git a/databases/libgda3/distinfo b/databases/libgda3/distinfo
index 5ad784e84494..8b3718c56376 100644
--- a/databases/libgda3/distinfo
+++ b/databases/libgda3/distinfo
@@ -1 +1 @@
-MD5 (gnome2/libgda-0.11.0.tar.bz2) = 8e50d1082033f413c8e8b700b078194b
+MD5 (gnome2/libgda-0.12.0.tar.bz2) = 445b26d782468c11f5cf3a972a710e42
diff --git a/databases/libgda3/pkg-plist b/databases/libgda3/pkg-plist
index 1c9c98253014..00c4b58d8e52 100644
--- a/databases/libgda3/pkg-plist
+++ b/databases/libgda3/pkg-plist
@@ -66,10 +66,10 @@ include/libgda/gda-xql-valueref.h
 include/libgda/libgda.h
 lib/libgda-2.a
 lib/libgda-2.so
-lib/libgda-2.so.1
+lib/libgda-2.so.2
 lib/libgda-report-2.a
 lib/libgda-report-2.so
-lib/libgda-report-2.so.1
+lib/libgda-report-2.so.2
 lib/libgdasql.a
 lib/libgdasql.so
 lib/libgdasql.so.0
@@ -79,10 +79,8 @@ lib/libgda/providers/libgda-default.so
 %%POSTGRES%%lib/libgda/providers/libgda-postgres.so
 libdata/pkgconfig/libgda.pc
 share/doc/libgda/architecture.html
-share/doc/libgda/c680.html
-share/doc/libgda/c685.html
-share/doc/libgda/c687.html
 share/doc/libgda/c689.html
+share/doc/libgda/c694.html
 share/doc/libgda/compiling.html
 share/doc/libgda/connecting.html
 share/doc/libgda/connections.html
@@ -167,15 +165,13 @@ share/doc/libgda/migration-configuration.html
 share/doc/libgda/migration-executing-commands.html
 share/doc/libgda/migration.html
 share/doc/libgda/processing-queries.html
-share/doc/libgda/x849.html
-share/doc/libgda/x851.html
 share/doc/libgda/x853.html
-share/doc/libgda/x878.html
-share/doc/libgda/x880.html
+share/doc/libgda/x863.html
 share/doc/libgda/x882.html
 share/doc/libgda/x883.html
-share/doc/libgda/x885.html
 share/doc/libgda/x887.html
+share/doc/libgda/x892.html
+share/doc/libgda/x897.html
 share/gnome/libgda/xml/gda-report.dtd
 share/gnome/libgda/xml/gda-report-result.dtd
 share/gnome/libgda/xml/gda-xml-query.dtd
@@ -188,6 +184,7 @@ share/locale/da/LC_MESSAGES/libgda-2.mo
 share/locale/de/LC_MESSAGES/libgda-2.mo
 share/locale/el/LC_MESSAGES/libgda-2.mo
 share/locale/es/LC_MESSAGES/libgda-2.mo
+share/locale/fa/LC_MESSAGES/libgda-2.mo
 share/locale/fi/LC_MESSAGES/libgda-2.mo
 share/locale/fr/LC_MESSAGES/libgda-2.mo
 share/locale/ga/LC_MESSAGES/libgda-2.mo
@@ -205,6 +202,8 @@ share/locale/pt_BR/LC_MESSAGES/libgda-2.mo
 share/locale/ru/LC_MESSAGES/libgda-2.mo
 share/locale/sk/LC_MESSAGES/libgda-2.mo
 share/locale/sl/LC_MESSAGES/libgda-2.mo
+share/locale/sr/LC_MESSAGES/libgda-2.mo
+share/locale/sr@Latn/LC_MESSAGES/libgda-2.mo
 share/locale/sv/LC_MESSAGES/libgda-2.mo
 share/locale/tr/LC_MESSAGES/libgda-2.mo
 share/locale/uk/LC_MESSAGES/libgda-2.mo