From 64cb3cc1795cb463ef33af376f92f7c49ae93669 Mon Sep 17 00:00:00 2001
From: ajacoutot <ajacoutot@openbsd.org>
Date: Mon, 14 Dec 2009 16:19:12 +0000
Subject: [PATCH] Update to evolution-2.28.2. *Lots* of bug fixes, sea
 changelog for details.

---
 mail/evolution/Makefile                |  8 ++++----
 mail/evolution/distinfo                | 10 +++++-----
 mail/evolution/patches/patch-configure | 14 +++++++-------
 3 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/mail/evolution/Makefile b/mail/evolution/Makefile
index eb3e2c5d3bf..5ccdf9eb101 100644
--- a/mail/evolution/Makefile
+++ b/mail/evolution/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.91 2009/11/17 23:31:13 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.92 2009/12/14 16:19:12 ajacoutot Exp $
 
 COMMENT-main=		integrated email and PIM software for GNOME
 COMMENT-plugins=	additionnal plugins for evolution
 
 GNOME_PROJECT=		evolution
-GNOME_VERSION=		2.28.1
+GNOME_VERSION=		2.28.2
 
 # Only get the first x.y which is needed in the PLIST.
 # NOTE: when major version changes, increment EVO_VERSION accordingly 
@@ -16,8 +16,8 @@ SUBST_VARS=		R
 
 # -plugins depends on the exact version of -main, so whenever -main is
 # bumped, -plugins needs a bump too
-PKGNAME-main=		${DISTNAME}p1
-PKGNAME-plugins=	evolution-plugins-${GNOME_VERSION}p1
+PKGNAME-main=		${DISTNAME}
+PKGNAME-plugins=	evolution-plugins-${GNOME_VERSION}
 
 CATEGORIES=		mail
 
diff --git a/mail/evolution/distinfo b/mail/evolution/distinfo
index e84d79884ee..36c94e90ff8 100644
--- a/mail/evolution/distinfo
+++ b/mail/evolution/distinfo
@@ -1,5 +1,5 @@
-MD5 (evolution-2.28.1.tar.bz2) = FQQ+ZPIgAPbwv1fgNzxxaQ==
-RMD160 (evolution-2.28.1.tar.bz2) = sneuSSd+GZQpmNOgBJ71N5aD7mg=
-SHA1 (evolution-2.28.1.tar.bz2) = BRaO0ncoOoAEbWu0ZJ9eze/JYG8=
-SHA256 (evolution-2.28.1.tar.bz2) = X69j52n0Hunk2Ff1rDvK4f5FxXo9vUhzQCKBw67HoTU=
-SIZE (evolution-2.28.1.tar.bz2) = 29728219
+MD5 (evolution-2.28.2.tar.bz2) = KvLmmc2KRrj3ubrsMYT2hQ==
+RMD160 (evolution-2.28.2.tar.bz2) = bl9a5gVj/aqdqkx494DPpVZ3AEM=
+SHA1 (evolution-2.28.2.tar.bz2) = GelwQXzJHIKlJ5z+XdcmLZ1MMxk=
+SHA256 (evolution-2.28.2.tar.bz2) = H0pQEn468IWwoHTc36BZW9+JJa7uKVkBwzgFw/8MJgM=
+SIZE (evolution-2.28.2.tar.bz2) = 29735192
diff --git a/mail/evolution/patches/patch-configure b/mail/evolution/patches/patch-configure
index c9e8b9f782a..7250726732c 100644
--- a/mail/evolution/patches/patch-configure
+++ b/mail/evolution/patches/patch-configure
@@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.11 2009/10/19 20:31:23 jasper Exp $
---- configure.orig	Sun Oct 18 04:22:56 2009
-+++ configure	Mon Oct 19 14:20:06 2009
-@@ -20083,9 +20083,6 @@ LIBS=$ac_check_lib_save_LIBS
+$OpenBSD: patch-configure,v 1.12 2009/12/14 16:19:12 ajacoutot Exp $
+--- configure.orig	Mon Dec 14 07:00:44 2009
++++ configure	Mon Dec 14 14:56:08 2009
+@@ -20089,9 +20089,6 @@ LIBS=$ac_check_lib_save_LIBS
  fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_resolv_res_query" >&5
  $as_echo "$ac_cv_lib_resolv_res_query" >&6; }
@@ -11,7 +11,7 @@ $OpenBSD: patch-configure,v 1.11 2009/10/19 20:31:23 jasper Exp $
  
  		{ $as_echo "$as_me:$LINENO: checking for bind in -lsocket" >&5
  $as_echo_n "checking for bind in -lsocket... " >&6; }
-@@ -20470,13 +20467,13 @@ _ACEOF
+@@ -20476,13 +20473,13 @@ _ACEOF
  
  
  	PTHREAD_LIB=""
@@ -28,7 +28,7 @@ $OpenBSD: patch-configure,v 1.11 2009/10/19 20:31:23 jasper Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -20536,7 +20533,7 @@ fi
+@@ -20542,7 +20539,7 @@ fi
  { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread_pthread_create" >&5
  $as_echo "$ac_cv_lib_pthread_pthread_create" >&6; }
  if test "x$ac_cv_lib_pthread_pthread_create" = x""yes; then
@@ -37,7 +37,7 @@ $OpenBSD: patch-configure,v 1.11 2009/10/19 20:31:23 jasper Exp $
  else
    { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
  $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
-@@ -22101,7 +22098,7 @@ if test "x${with_krb5}" != "xno"; then
+@@ -22107,7 +22104,7 @@ if test "x${with_krb5}" != "xno"; then
  	LIBS_save="$LIBS"
  
  	mitlibs="-lkrb5 -lk5crypto -lcom_err -lgssapi_krb5"