Update to 4.2.1.

Clean up some non existing provider config.


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

4 files changed, 32 insertions, 44 deletions

diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 7049df813..659800606 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.12 2010/09/28 07:19:33 kwm Exp $
+#   $MCom: ports/databases/libgda4/Makefile,v 1.13 2010/10/18 12:47:12 kwm Exp $
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.2.0
-PORTREVISION?=	1
+PORTVERSION?=	4.2.1
+PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 MASTER_SITE_SUBDIR=	sources/${PORTNAME:S/4$//}/${PORTVERSION:R}
@@ -37,7 +37,7 @@ USE_GNOME=	gnomeprefix gnomehack glib20 libxslt intlhack referencehack
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=yes
-CONFIGURE_ARGS=	--without-sybase \
+CONFIGURE_ARGS=	--without-oracle \
 		--enable-introspection=no
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib -lintl"
@@ -93,13 +93,6 @@ CONFIGURE_ARGS+=	--with-postgres=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-postgres
 .endif
 
-.if ${LIBGDA4_SLAVE}=="ldap"
-USE_OPENLDAP=		yes
-CONFIGURE_ARGS+=	--with-ldap=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-ldap
-.endif
-
 .if ${LIBGDA4_SLAVE}=="firebird"
 LIB_DEPENDS+=		gds.2:${PORTSDIR}/databases/firebird2-client
 CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
@@ -107,13 +100,6 @@ CONFIGURE_ARGS+=	--with-firebird=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-firebird
 .endif
 
-.if ${LIBGDA4_SLAVE}=="freetds"
-LIB_DEPENDS+=		tds.5:${PORTSDIR}/databases/freetds
-CONFIGURE_ARGS+=	--with-tds=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-tds
-.endif
-
 # MDB (MS Access)
 .if ${LIBGDA4_SLAVE}=="mdb"
 LIB_DEPENDS+=		mdbsql.0:${PORTSDIR}/databases/mdbtools
@@ -122,13 +108,6 @@ CONFIGURE_ARGS+=	--with-mdb=${LOCALBASE}
 CONFIGURE_ARGS+=	--without-mdb
 .endif
 
-.if ${LIBGDA4_SLAVE}=="odbc"
-LIB_DEPENDS+=		odbc.1:${PORTSDIR}/databases/unixODBC
-CONFIGURE_ARGS+=	--with-odbc=${LOCALBASE}
-.else
-CONFIGURE_ARGS+=	--without-odbc
-.endif
-
 .if ${LIBGDA4_SLAVE}=="jdbc"
 USE_JAVA=		yes
 JAVA_VENDOR=		bsdjava openjdk
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index 5e1aad8fd..faa377616 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,2 @@
-MD5 (gnome2/libgda-4.2.0.tar.bz2) = 4b00c2b61430b2a0ea00e0332d1e8ef4
-SHA256 (gnome2/libgda-4.2.0.tar.bz2) = 2e639957f50719957cea5326b0d95511794322a54f9ef8547d3241f409765441
-SIZE (gnome2/libgda-4.2.0.tar.bz2) = 13932542
+SHA256 (gnome2/libgda-4.2.1.tar.bz2) = d485d24fb19bd95faad196c8ed22b2cb8f9e9275d907f880a3f8f079f6bf40f7
+SIZE (gnome2/libgda-4.2.1.tar.bz2) = 14048095
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
index 9767f66d1..cf6a34b0c 100644
--- a/databases/libgda4/files/patch-configure
+++ b/databases/libgda4/files/patch-configure
@@ -1,6 +1,6 @@
---- configure.orig	2010-09-26 23:47:18.000000000 +0000
-+++ configure	2010-09-28 00:05:04.000000000 +0000
-@@ -19504,9 +19504,9 @@
+--- configure.orig	2010-11-14 17:29:29.000000000 +0100
++++ configure	2010-11-14 17:33:39.000000000 +0100
+@@ -19487,9 +19487,9 @@
              INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0`
              INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0`
              INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0`
@@ -12,7 +12,25 @@
              INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
              INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
              INTROSPECTION_MAKEFILE=$introspection_makefile
-@@ -21517,6 +21517,15 @@
+@@ -19586,7 +19586,7 @@
+ 	echo "$LIBCRYPTO_PKG_ERRORS" >&5
+ 
+ 	if test "$enable_crypto" = "yes"; then
+-		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++#		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ 	fi
+ 	have_crypto=no
+ 
+@@ -19594,7 +19594,7 @@
+      	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ 	if test "$enable_crypto" = "yes"; then
+-		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
++#		as_fn_error $? "libcrypto support requested but not found" "$LINENO" 5
+ 	fi
+ 	have_crypto=no
+ 
+@@ -21772,6 +21772,15 @@
  	    fi
  	    CFLAGS="$save_CFLAGS"
  	fi
@@ -27,15 +45,4 @@
 +
      fi
  
- 
-@@ -23351,6 +23360,10 @@
-   as_fn_error "conditional \"MDB\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
- fi
-+if test -z "${MDB_TRUE}" && test -z "${MDB_FALSE}"; then
-+  as_fn_error $? "conditional \"MDB\" was never defined.
-+Usually this means the macro was only invoked conditionally." "$LINENO" 5
-+fi
- if test -z "${LDAP_TRUE}" && test -z "${LDAP_FALSE}"; then
-   as_fn_error "conditional \"LDAP\" was never defined.
- Usually this means the macro was only invoked conditionally." "$LINENO" 5
+      if test "$mdbtools_found" = "yes"; then
diff --git a/databases/libgda4/pkg-plist b/databases/libgda4/pkg-plist
index fd5db921a..63dbcf346 100644
--- a/databases/libgda4/pkg-plist
+++ b/databases/libgda4/pkg-plist
@@ -386,6 +386,7 @@ 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-4.0.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
@@ -488,3 +489,5 @@ share/locale/zh_TW/LC_MESSAGES/libgda-%%VERSION%%.mo
 @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