Update to 2.26.2, split off options handling into options.mk.

Evolution-Data-Server 2.26.2 2009-05-18
----------------------------------------

Bug fixes:
	#581420 - On Solaris, the service name 'http' or 'https' is not defined (Jeff Cai)
	#579360 - Problem with vfolders/hang with unmatched folders. (Srinivasa Ragavan)
	#573170 - Add back support for vfolder of vfolders. (Srinivasa Ragavan)
	#556116 - support for unmatched search folder (Srinivasa Ragavan)
	#578823 – invalid condition (Sergio Villar Senin)
	#578821 - More invalid conditions (Sergio Villar Senin)

Updated Translations:
	Milo Casagrande (it)
	Christian Kirbach (de)

Other fixes:
	dolt has some link issues with library dependency (Marc-André Lureau)
	Map WinLDAP to openLDAP api in win32 (Fridrich Strba)

4 files changed, 30 insertions, 26 deletions

diff --git a/mail/evolution-data-server/Makefile b/mail/evolution-data-server/Makefile
index 563d297f8d3..88fc0a3dfa2 100644
--- a/mail/evolution-data-server/Makefile
+++ b/mail/evolution-data-server/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.88 2009/05/19 08:59:21 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2009/05/28 20:25:25 wiz Exp $
 #
 
-DISTNAME=	evolution-data-server-2.26.1.1
+DISTNAME=	evolution-data-server-2.26.2
 CATEGORIES=	mail gnome
 MASTER_SITES=	${MASTER_SITE_GNOME:=sources/evolution-data-server/2.26/}
 EXTRACT_SUFX=	.tar.bz2
@@ -23,9 +23,7 @@ USE_PKGLOCALEDIR=	YES
 PYTHON_FOR_BUILD_ONLY=	YES
 PYTHON_PATCH_SCRIPTS=	addressbook/libebook/gen-western-table.py
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution-data-server
-PKG_SUPPORTED_OPTIONS=	inet6
-.include "../../mk/bsd.options.mk"
+.include "options.mk"
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -52,12 +50,6 @@ CONFIGURE_ARGS+=	--with-openldap
 CONFIGURE_ARGS+=	--with-libdb=${LOCALBASE}
 BUILDLINK_TRANSFORM+=	l:db:db4
 
-.if !empty(PKG_OPTIONS:Minet6)
-CONFIGURE_ARGS+=	--enable-ipv6
-.else
-CONFIGURE_ARGS+=	--disable-ipv6
-.endif
-
 PKGCONFIG_OVERRIDE+=	addressbook/libebook/libebook.pc.in
 PKGCONFIG_OVERRIDE+=	addressbook/libedata-book/libedata-book.pc.in
 PKGCONFIG_OVERRIDE+=	calendar/libecal/libecal.pc.in
diff --git a/mail/evolution-data-server/distinfo b/mail/evolution-data-server/distinfo
index eee661d40c6..94b68ddefa3 100644
--- a/mail/evolution-data-server/distinfo
+++ b/mail/evolution-data-server/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.60 2009/04/17 17:27:48 drochner Exp $
+$NetBSD: distinfo,v 1.61 2009/05/28 20:25:25 wiz Exp $
 
-SHA1 (evolution-data-server-2.26.1.1.tar.bz2) = fac4eb21d27cff981d97b5135fb8715947fdde9b
-RMD160 (evolution-data-server-2.26.1.1.tar.bz2) = 3d467c9ed3c0d9fa47efd8c4f995114b5b25d60a
-Size (evolution-data-server-2.26.1.1.tar.bz2) = 7375026 bytes
+SHA1 (evolution-data-server-2.26.2.tar.bz2) = ca60a350259c6bc297cc0c324c5908a3d08ac4e3
+RMD160 (evolution-data-server-2.26.2.tar.bz2) = c8ede51a8537dc9db96a796a0904f0fedcc25f37
+Size (evolution-data-server-2.26.2.tar.bz2) = 7257425 bytes
 SHA1 (patch-ab) = fff3e022aee934c463d7a66b681e020d3bebe1b0
 SHA1 (patch-af) = 1e458720684cfe3823b3b73665044336588c4620
-SHA1 (patch-ak) = 96d700741a4e9f14d94824a8a8d801251e638ab3
+SHA1 (patch-ak) = 0aab77d3bf0fa8a3f962ba5a849947830bae3902
 SHA1 (patch-aq) = 375d592b72f59fa70160bf23aa260338d350c517
 SHA1 (patch-ar) = b6b92b068f94954d435cff11543a4de7d07712ac
 SHA1 (patch-at) = 32bb4f9de33a3799ad7a1a00dd072b38a800185c
diff --git a/mail/evolution-data-server/options.mk b/mail/evolution-data-server/options.mk
new file mode 100644
index 00000000000..4debdd64dfe
--- /dev/null
+++ b/mail/evolution-data-server/options.mk
@@ -0,0 +1,12 @@
+# $NetBSD: options.mk,v 1.1 2009/05/28 20:25:25 wiz Exp $
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.evolution-data-server
+PKG_SUPPORTED_OPTIONS=	inet6
+
+.include "../../mk/bsd.options.mk"
+
+.if !empty(PKG_OPTIONS:Minet6)
+CONFIGURE_ARGS+=	--enable-ipv6
+.else
+CONFIGURE_ARGS+=	--disable-ipv6
+.endif
diff --git a/mail/evolution-data-server/patches/patch-ak b/mail/evolution-data-server/patches/patch-ak
index 59bb4719f86..15f6fa76cac 100644
--- a/mail/evolution-data-server/patches/patch-ak
+++ b/mail/evolution-data-server/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.9 2009/03/19 12:02:09 drochner Exp $
+$NetBSD: patch-ak,v 1.10 2009/05/28 20:25:25 wiz Exp $
 
---- configure.orig	2009-03-13 19:09:14.000000000 +0100
+--- configure.orig	2009-05-18 02:45:48.000000000 +0000
 +++ configure
-@@ -28838,6 +28838,7 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -19851,6 +19851,7 @@ cat >>conftest.$ac_ext <<_ACEOF
  		#include <sys/socket.h>
  		#include <netinet/in.h>
  		#include <netdb.h>
@@ -10,7 +10,7 @@ $NetBSD: patch-ak,v 1.9 2009/03/19 12:02:09 drochner Exp $
  
  
  int
-@@ -31793,13 +31794,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
+@@ -22803,13 +22804,13 @@ EVO_MARSHAL_RULE=$srcdir/marshal.mk
  
  
  	PTHREAD_LIB=""
@@ -27,12 +27,12 @@ $NetBSD: patch-ak,v 1.9 2009/03/19 12:02:09 drochner Exp $
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -31859,7 +31860,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 $ac_cv_lib_pthread_pthread_create = yes; then
+@@ -23073,7 +23074,7 @@ fi
+ { $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pthread___pthread_attr_init_system" >&5
+ $as_echo "$ac_cv_lib_pthread___pthread_attr_init_system" >&6; }
+ if test "x$ac_cv_lib_pthread___pthread_attr_init_system" = x""yes; then
 -  PTHREAD_LIB="-lpthread"
 +  PTHREAD_LIB="${PTHREAD_LIB}"
  else
-   { $as_echo "$as_me:$LINENO: checking for pthread_create in -lpthreads" >&5
- $as_echo_n "checking for pthread_create in -lpthreads... " >&6; }
+   { $as_echo "$as_me:$LINENO: checking for pthread_create" >&5
+ $as_echo_n "checking for pthread_create... " >&6; }