6 files changed, 27 insertions, 24 deletions

diff --git a/databases/evolution-data-server/Makefile b/databases/evolution-data-server/Makefile
index 078f78fba953..78b37c26f16d 100644
--- a/databases/evolution-data-server/Makefile
+++ b/databases/evolution-data-server/Makefile
@@ -3,12 +3,12 @@
 # Whom:					Joe Marcus Clarke <marcus@FreeBSD.org>
 #
 # $FreeBSD$
-#   $MCom: ports/databases/evolution-data-server/Makefile,v 1.194 2010/04/26 13:45:12 kwm Exp $
+#   $MCom: ports-stable/databases/evolution-data-server/Makefile,v 1.8 2010/06/24 10:03:53 kwm Exp $
 #
 
 PORTNAME=	evolution-data-server
-PORTVERSION=	2.30.1
-PORTREVISION=	2
+PORTVERSION=	2.30.2.1
+PORTREVISION=	1
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
 DIST_SUBDIR=	gnome2
@@ -22,7 +22,7 @@ LIB_DEPENDS=	soup-2.4.1:${PORTSDIR}/devel/libsoup \
 		nss3.1:${PORTSDIR}/security/nss \
 		tasn1.4:${PORTSDIR}/security/libtasn1 \
 		sqlite3.8:${PORTSDIR}/databases/sqlite3 \
-		gnome-keyring.0:${PORTSDIR}/security/gnome-keyring
+		gnome-keyring.0:${PORTSDIR}/security/libgnome-keyring
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
@@ -85,6 +85,7 @@ pre-everything::
 post-patch:
 	@${REINPLACE_CMD} -e 's|-ldb|-l${BDB_LIB_NAME}|g ; \
 		s|heimlibs=".*"|heimlibs="${KRB5_LIB}"|g ; \
+		s|LIBEDATASERVER_CURRENT=13|LIBEDATASERVER_CURRENT=11|g ; \
 		s|-Wl,--no-undefined||g ; \
 		s|-Wmissing-include-dirs||g' \
 			${WRKSRC}/configure
diff --git a/databases/evolution-data-server/distinfo b/databases/evolution-data-server/distinfo
index cd82fa631e3b..0f557a05b42d 100644
--- a/databases/evolution-data-server/distinfo
+++ b/databases/evolution-data-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/evolution-data-server-2.30.1.tar.bz2) = f177441d6fd4ef8c9a92d5706d290f10
-SHA256 (gnome2/evolution-data-server-2.30.1.tar.bz2) = b2ebeac36931fbee6fb747ee535a61243dd99fa15bc472ca239f2b01cc88795e
-SIZE (gnome2/evolution-data-server-2.30.1.tar.bz2) = 4636784
+MD5 (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 826d85fc6e088156154ae0c543454d7f
+SHA256 (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 17fa6d42957a0b7b1c3887e6f8d4b78cf69b01fc8afd080788ed2947d1048f23
+SIZE (gnome2/evolution-data-server-2.30.2.1.tar.bz2) = 4645500
diff --git a/databases/libgda4/Makefile b/databases/libgda4/Makefile
index 2ce848039d61..0e2329f62f97 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.5 2010/03/14 19:24:27 marcus Exp $
+#   $MCom: ports-stable/databases/libgda4/Makefile,v 1.4 2010/06/23 21:29:32 kwm Exp $
 #
 
 PORTNAME=	libgda4
-PORTVERSION?=	4.0.8
+PORTVERSION?=	4.0.9
 PORTREVISION?=	0
 CATEGORIES=	databases gnome
 MASTER_SITES=	GNOME
diff --git a/databases/libgda4/distinfo b/databases/libgda4/distinfo
index eed091dfa0ea..5ba3eb25adc8 100644
--- a/databases/libgda4/distinfo
+++ b/databases/libgda4/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/libgda-4.0.8.tar.bz2) = 3e4a55f370805cda9ac415211da4aacc
-SHA256 (gnome2/libgda-4.0.8.tar.bz2) = c731cd8015f63a3bff37341cb8ffc4d8086a535d960af098194968ac87555788
-SIZE (gnome2/libgda-4.0.8.tar.bz2) = 8229914
+MD5 (gnome2/libgda-4.0.9.tar.bz2) = de14cf681c0bcfb3a4076a3ddc1508a2
+SHA256 (gnome2/libgda-4.0.9.tar.bz2) = c3e2958cd711177ec4be0a69cd453ab728526fa38592c5539e7d89d3778e9e56
+SIZE (gnome2/libgda-4.0.9.tar.bz2) = 8227552
diff --git a/databases/libgda4/files/patch-configure b/databases/libgda4/files/patch-configure
new file mode 100644
index 000000000000..6e42fcfab8ff
--- /dev/null
+++ b/databases/libgda4/files/patch-configure
@@ -0,0 +1,14 @@
+--- configure.orig	2010-06-23 23:07:54.000000000 +0200
++++ configure	2010-06-23 23:09:57.000000000 +0200
+@@ -18629,9 +18629,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`
+-       INTROSPECTION_GIRDIR=${INTROSPECTION_GIRDIR/$datadir/\$(datadir)}
++       INTROSPECTION_GIRDIR=`echo ${INTROSPECTION_GIRDIR} | sed -e "s|${datadir}|\\\${datadir}|"`
+        INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)"
+-       INTROSPECTION_TYPELIBDIR=${INTROSPECTION_TYPELIBDIR/$libdir/\$(libdir)}
++       INTROSPECTION_TYPELIBDIR=`echo ${INTROSPECTION_TYPELIBDIR} | sed -e "s|${libdir}|\\\${libdir}|"`
+        INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0`
+        INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0`
+        INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection
diff --git a/databases/libgda4/files/patch-libgda_Makefile.in b/databases/libgda4/files/patch-libgda_Makefile.in
deleted file mode 100644
index e33d5924a1d5..000000000000
--- a/databases/libgda4/files/patch-libgda_Makefile.in
+++ /dev/null
@@ -1,12 +0,0 @@
---- libgda/Makefile.in.orig	2010-03-21 03:57:28.000000000 -0400
-+++ libgda/Makefile.in	2010-03-21 03:58:29.000000000 -0400
-@@ -1349,7 +1349,8 @@ dist-hook:
- @HAVE_INTROSPECTION_TRUE@		--include=GL-1.0 \
- @HAVE_INTROSPECTION_TRUE@		--include=GObject-2.0 \
- @HAVE_INTROSPECTION_TRUE@		--include=libxml2-2.0 \
--@HAVE_INTROSPECTION_TRUE@		--library=gda-@GDA_ABI_VERSION@ \
-+@HAVE_INTROSPECTION_TRUE@		--libtool="$(LIBTOOL)" \
-+@HAVE_INTROSPECTION_TRUE@		--library=libgda-@GDA_ABI_VERSION@.la \
- @HAVE_INTROSPECTION_TRUE@	    $(INCLUDE_CFLAGS) \
- @HAVE_INTROSPECTION_TRUE@	    --output $@ \
- @HAVE_INTROSPECTION_TRUE@		$(addprefix $(srcdir)/, $(gda_headers)) \