- update evolution-data-server to 2.28.0

commiting now to not stall other work, possible breakage will be dealt with thisweek

"commit!" aja@

databases/evolution-data-server/Makefile

@@ -1,28 +1,28 @@
-# $OpenBSD: Makefile,v 1.49 2009/08/20 07:51:46 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.50 2009/10/11 12:42:41 jasper Exp $
 
 SHARED_ONLY=		Yes
 
 COMMENT=		data backends for the Evolution mail/PIM suite
 
 GNOME_PROJECT=		evolution-data-server
-GNOME_VERSION=		2.24.5
-PKGNAME=		${DISTNAME}p4
+GNOME_VERSION=		2.28.0
 
 CATEGORIES=		databases
 
-SHARED_LIBS +=	edataserver-1.2      10.0     # .11.0
-SHARED_LIBS +=	ebackend-1.2         0.0      # .0.0
+SHARED_LIBS +=	edataserver-1.2      10.1     # .11.0
+SHARED_LIBS +=	ebackend-1.2         0.1      # .0.0
 SHARED_LIBS +=	egroupwise-1.2       13.1     # .13.1
 SHARED_LIBS +=	exchange-storage-1.2 3.0      # .3.0
-SHARED_LIBS +=	gdata-1.2            0.0      # .1.0
-SHARED_LIBS +=	gdata-google-1.2     0.0      # .1.0
-SHARED_LIBS +=	camel-1.2            14.0     # .14.0
-SHARED_LIBS +=	camel-provider-1.2   14.0     # .14.0
-SHARED_LIBS +=	ebook-1.2            12.0     # .12.0
+SHARED_LIBS +=	gdata-1.2            1.0      # .1.0
+SHARED_LIBS +=	gdata-google-1.2     1.0      # .1.0
+SHARED_LIBS +=	camel-1.2            14.1     # .14.1
+SHARED_LIBS +=	camel-provider-1.2   14.1     # .14.1
+SHARED_LIBS +=	ebook-1.2            12.1     # .12.1
 SHARED_LIBS +=	edata-book-1.2       6.1      # .6.1
 SHARED_LIBS +=	ecal-1.2             9.1      # .9.1
 SHARED_LIBS +=	edata-cal-1.2        6.2      # .6.2
-SHARED_LIBS +=	edataserverui-1.2    9.0      # .9.0
+SHARED_LIBS +=	edataserverui-1.2    9.1      # .9.1
+
 
 HOMEPAGE=		http://www.gnome.org/projects/evolution/
 
@@ -35,17 +35,15 @@ PERMIT_PACKAGE_FTP=	Yes
 PERMIT_DISTFILES_CDROM=	Yes
 PERMIT_DISTFILES_FTP=	Yes
 
-WANTLIB=	ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor \
-		Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender \
-		asn1 atk-1.0 avahi-client avahi-common avahi-glib \
-		bonobo-2 bonobo-activation c \
-		cairo com_err crypto dbus-1 dbus-glib-1 expat fontconfig \
-		freetype gconf-2 gcrypt gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 \
-		glib-2.0 glitz gmodule-2.0 gnomevfs-2 gnutls gobject-2.0 gpg-error gssapi \
-		gthread-2.0 gtk-x11-2.0 krb5 m nspr4 pango-1.0 pangocairo-1.0 \
-		pangoft2-1.0 pcre pixman-1 plc4 plds4 png popt pthread \
-		sasl2 sqlite3 ssl tasn1 util xml2 z \
-		pthread-stubs xcb
+WANTLIB += ORBit-2 ORBitCosNaming-2 X11 Xau Xcomposite Xcursor
+WANTLIB += Xdamage Xdmcp Xext Xfixes Xi Xinerama Xrandr Xrender
+WANTLIB += asn1 atk-1.0 c cairo com_err crypto dbus-1 dbus-glib-1
+WANTLIB += expat fontconfig freetype gconf-2 gcrypt gdk-x11-2.0
+WANTLIB += gdk_pixbuf-2.0 gio-2.0 glib-2.0 glitz gmodule-2.0 gpg-error
+WANTLIB += gobject-2.0 gssapi gthread-2.0 gtk-x11-2.0 krb5 m nspr4
+WANTLIB += pango-1.0 pangocairo-1.0 pangoft2-1.0 pcre pixman-1 plc4
+WANTLIB += plds4 png pthread pthread-stubs sasl2 sqlite3 ssl tasn1
+WANTLIB += xcb xml2 z
 
 MODULES=		devel/gettext \
 			lang/python \
@@ -58,9 +56,13 @@ LIB_DEPENDS= 		db:db->=4,<5:databases/db/v4 \
 			ldap,lber::databases/openldap \
 			glade-2.0::devel/libglade2 \
 			soup-2.4::devel/libsoup \
+			gpg-error::security/libgpg-error \
+			gnutls::security/gnutls \
 			nss3.>=19,smime3.>=19,softokn3.>=19,ssl3.>=19:nss->=3.11.4p1:security/nss \
-			gnome-2::x11/gnome/libgnome \
-			gnome-keyring.>=3::x11/gnome/keyring
+			ical,icalss,icalvcal::textproc/libical \
+			gnome-keyring::x11/gnome/keyring \
+			bonobo-2,bonobo-activation::x11/gnome/libbonobo \
+			gweather::x11/gnome/libgweather
 
 USE_X11=		Yes
 YACC=			bison

databases/evolution-data-server/distinfo

@@ -1,5 +1,5 @@
-MD5 (evolution-data-server-2.24.5.tar.bz2) = zxLwK4zAoV4EbBIeanJQyw==
-RMD160 (evolution-data-server-2.24.5.tar.bz2) = 1fMvNaUeMohfltT5LXoMb64kmpI=
-SHA1 (evolution-data-server-2.24.5.tar.bz2) = sd8fNYDjVm0I+vLAk6aF7pd9ZIw=
-SHA256 (evolution-data-server-2.24.5.tar.bz2) = wiQLlkN/NvNlbaU433YxUQeFZkpudyPL917A+Iw9ONE=
-SIZE (evolution-data-server-2.24.5.tar.bz2) = 7857405
+MD5 (evolution-data-server-2.28.0.tar.bz2) = AVqWkpBMNJA0mCxp2QsbNw==
+RMD160 (evolution-data-server-2.28.0.tar.bz2) = oTirIFusCLZWEa0BzVOp+M61XPc=
+SHA1 (evolution-data-server-2.28.0.tar.bz2) = 3D/9+5l+fP05Ij0E202tUO04wEQ=
+SHA256 (evolution-data-server-2.28.0.tar.bz2) = Af6tYEgW+xNa61khaH2Zdz6WYBShfByuIwwwc4bhOBQ=
+SIZE (evolution-data-server-2.28.0.tar.bz2) = 14469718

databases/evolution-data-server/patches/patch-configure_ac

@@ -0,0 +1,12 @@
+$OpenBSD: patch-configure_ac,v 1.1 2009/10/11 12:42:41 jasper Exp $
+--- configure.ac.orig	Sat Oct 10 18:40:55 2009
++++ configure.ac	Sat Oct 10 18:41:04 2009
+@@ -1125,7 +1125,7 @@ if test "x${with_krb5}" != "xno"; then
+ 	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_CHECK([for Kerberos 5], [ac_cv_lib_kerberos5],
+ 	[

databases/evolution-data-server/patches/patch-libdb_dist_configure

@@ -1,7 +1,7 @@
-$OpenBSD: patch-libdb_dist_configure,v 1.3 2007/05/17 14:40:53 jasper Exp $
---- libdb/dist/configure.orig	Wed Jan  3 11:10:02 2007
-+++ libdb/dist/configure	Sun Apr 22 21:11:41 2007
-@@ -7768,7 +7768,7 @@ _ACEOF
+$OpenBSD: patch-libdb_dist_configure,v 1.4 2009/10/11 12:42:41 jasper Exp $
+--- libdb/dist/configure.orig	Sat Oct 10 18:42:53 2009
++++ libdb/dist/configure	Sat Oct 10 19:10:35 2009
+@@ -7768,17 +7768,17 @@ _ACEOF
      hardcode_direct=yes
      hardcode_shlibpath_var=no
      if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -10,7 +10,10 @@ $OpenBSD: patch-libdb_dist_configure,v 1.3 2007/05/17 14:40:53 jasper Exp $
        hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
        export_dynamic_flag_spec='${wl}-E'
      else
-@@ -7778,7 +7778,7 @@ _ACEOF
+       case "$host_os" in
+       openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
+-	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $compiler_flags'
  	hardcode_libdir_flag_spec='-R$libdir'
          ;;
        *)

databases/evolution-data-server/patches/patch-libedataserverui_e-source-selector_c

@@ -1,15 +1,15 @@
-$OpenBSD: patch-libedataserverui_e-source-selector_c,v 1.1 2009/08/18 13:29:40 ajacoutot Exp $
+$OpenBSD: patch-libedataserverui_e-source-selector_c,v 1.2 2009/10/11 12:42:41 jasper Exp $
 
 From upstream git:
 Remove an assertion in ESourceSelector.
 Related to bug #541192. Something accessibility-related is causing the
 assertion to fail. The problem is still unknown, but the logic is more
 forgiving now.
 
---- libedataserverui/e-source-selector.c.orig	Tue Aug 18 14:19:19 2009
-+++ libedataserverui/e-source-selector.c	Tue Aug 18 14:21:24 2009
-@@ -525,18 +525,17 @@ pixbuf_cell_data_func (GtkTreeViewColumn *column,
- 	void *data;
+--- libedataserverui/e-source-selector.c.orig	Fri Aug  7 15:20:30 2009
++++ libedataserverui/e-source-selector.c	Sat Oct 10 19:13:13 2009
+@@ -523,18 +523,17 @@ pixbuf_cell_data_func (GtkTreeViewColumn *column,
+ 	gpointer data;
 
  	gtk_tree_model_get (model, iter, 0, &data, -1);
 +	g_return_if_fail (G_IS_OBJECT (data));