diff --git a/x11/gnome3/databases/evolution-data-server/Makefile b/x11/gnome3/databases/evolution-data-server/Makefile
index d46dfe37eb0..b713ff2f307 100644
--- a/x11/gnome3/databases/evolution-data-server/Makefile
+++ b/x11/gnome3/databases/evolution-data-server/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2011/07/03 17:14:23 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2011/07/12 09:25:32 ajacoutot Exp $
 
 SHARED_ONLY=		Yes
 
@@ -7,7 +7,7 @@ COMMENT=		unified backend for PIM programs
 GNOME_PROJECT=		evolution-data-server
 GNOME_VERSION=		3.0.2.1
 
-REVISION=		2
+REVISION=		3
 
 CATEGORIES=		databases
 
@@ -61,7 +61,11 @@ LIB_DEPENDS= 		databases/db/v4 \
 
 YACC=			bison
 
-CONFIGURE_STYLE= 	gnu
+# should be 2.66
+AUTOCONF_VERSION=	2.65
+AUTOMAKE_VERSION=	1.9
+
+CONFIGURE_STYLE= 	autoconf
 CONFIGURE_ARGS=		${CONFIGURE_SHARED} \
 			--disable-gtk-doc \
 			--enable-introspection \
diff --git a/x11/gnome3/databases/evolution-data-server/patches/patch-configure b/x11/gnome3/databases/evolution-data-server/patches/patch-configure
deleted file mode 100644
index 51a000b68f3..00000000000
--- a/x11/gnome3/databases/evolution-data-server/patches/patch-configure
+++ /dev/null
@@ -1,43 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2011/05/23 17:02:28 jasper Exp $
-
-- "$host" fails for some reason.
-
---- configure.orig	Mon May 23 17:12:56 2011
-+++ configure	Mon May 23 18:46:56 2011
-@@ -4341,13 +4341,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
- 
- 
- 
--case "$host" in
--*openbsd*|*freebsd*)
--		;;
--*)
--	LDFLAGS="$LDFLAGS -Wl,--no-undefined"
--	;;
--esac
- 
- 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
-@@ -16161,6 +16154,13 @@ fi
- $as_echo "#define _WIN32_WINNT 0x501" >>confdefs.h
- 
- 	;;
-+*openbsd*)
-+	os_win32='no'
-+	NO_UNDEFINED=''
-+	SOCKET_LIBS=''
-+	DL_LIB=''
-+	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
-+	;;
- *)
- 	os_win32='no'
- 	NO_UNDEFINED=''
-@@ -18145,7 +18145,7 @@ $as_echo_n "checking for Kerberos 5... " >&6; }
- 		LIBS_save="$LIBS"
- 
- 		mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
--		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
-+		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
- 		sunlibs="-lkrb5 -lgss"
- 		if test "${ac_cv_lib_kerberos5+set}" = set; then :
-   $as_echo_n "(cached) " >&6
diff --git a/x11/gnome3/databases/evolution-data-server/patches/patch-configure_ac b/x11/gnome3/databases/evolution-data-server/patches/patch-configure_ac
new file mode 100644
index 00000000000..797d624c8f5
--- /dev/null
+++ b/x11/gnome3/databases/evolution-data-server/patches/patch-configure_ac
@@ -0,0 +1,52 @@
+$OpenBSD: patch-configure_ac,v 1.1 2011/07/12 09:25:32 ajacoutot Exp $
+
+https://bugzilla.gnome.org/show_bug.cgi?id=654444
+
+--- configure.ac.orig	Mon May 23 17:06:26 2011
++++ configure.ac	Tue Jul 12 10:33:07 2011
+@@ -185,15 +185,6 @@ AM_CPPFLAGS="$WARNING_FLAGS -fno-strict-aliasing"
+ AC_SUBST(AM_CPPFLAGS)
+ 
+ 
+-case "$host" in
+-*openbsd*|*freebsd*)
+-	dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
+-	;;
+-*)
+-	LDFLAGS="$LDFLAGS -Wl,--no-undefined"
+-	;;
+-esac
+-
+ dnl ******************************
+ dnl Initialize maintainer mode
+ dnl ******************************
+@@ -265,6 +256,15 @@ dnl Gtk Doc stuff
+ dnl ******************************
+ GTK_DOC_CHECK(1.9)
+ 
++case "$host" in
++*openbsd*|*freebsd*)
++	dnl Do not set '-Wl,--no-undefined' on freebsd/openbsd
++	;;
++*)
++	LDFLAGS="$LDFLAGS -Wl,--no-undefined"
++;;
++esac
++
+ dnl ******************************
+ dnl Check for Win32
+ dnl ******************************
+@@ -278,6 +278,13 @@ case "$host" in
+ 	LIBEXECDIR_IN_SERVER_FILE='../../../libexec'
+ 	AC_CACHE_VAL(ac_cv_have_addrinfo, [ac_cv_have_addrinfo=yes])
+ 	AC_DEFINE(_WIN32_WINNT, 0x501, [To get getaddrinfo etc declarations])
++	;;
++*openbsd*|*freebsd*)
++	os_win32='no'
++	NO_UNDEFINED=''
++	SOCKET_LIBS=''
++	DL_LIB=''
++	LIBEXECDIR_IN_SERVER_FILE="$libexecdir"
+ 	;;
+ *)
+ 	os_win32='no'
diff --git a/x11/gnome3/databases/evolution-data-server/patches/patch-m4_evo_krb5_support_m4 b/x11/gnome3/databases/evolution-data-server/patches/patch-m4_evo_krb5_support_m4
new file mode 100644
index 00000000000..18dd6fe0223
--- /dev/null
+++ b/x11/gnome3/databases/evolution-data-server/patches/patch-m4_evo_krb5_support_m4
@@ -0,0 +1,12 @@
+$OpenBSD: patch-m4_evo_krb5_support_m4,v 1.1 2011/07/12 09:25:32 ajacoutot Exp $
+--- m4/evo_krb5_support.m4.orig	Tue Jul 12 10:36:17 2011
++++ m4/evo_krb5_support.m4	Tue Jul 12 10:36:30 2011
+@@ -27,7 +27,7 @@ AC_DEFUN([EVO_KRB5_SUPPORT],[
+ 		LIBS_save="$LIBS"
+ 
+ 		mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"
+-		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lroken -lgssapi"
++		heimlibs="-lkrb5 -lcrypto -lasn1 -lcom_err -lgssapi"
+ 		sunlibs="-lkrb5 -lgss"
+ 		AC_CACHE_VAL([ac_cv_lib_kerberos5],
+ 		[