*MAJOR* version update to zarafa-6.40.0.

Read the complete changelog here: http://download.zarafa.com/zarafa/release/docs/changelog.en.txt Upgrade documentation is available at: http://doc.zarafa.com/6.40/Administrator_Manual/en-US/html-single/index.html#_performing_the_upgrade zarafa-libical has been removed, current version from ports works fine for zarafa needs. php5-mapi has been merged into zarafa-webaccess.
2010-06-30 02:46:47 +00:00 · 2010-06-30 02:46:47 +00:00 · 58a6931cc6
commit 58a6931cc6
parent 4fee540f7d
73 changed files with 1068 additions and 1041 deletions
--- a/mail/zarafa/Makefile
+++ b/mail/zarafa/Makefile
@ -1,9 +1,7 @@
-# $OpenBSD: Makefile,v 1.2 2010/02/01 17:00:13 espie Exp $
+# $OpenBSD: Makefile,v 1.3 2010/06/30 02:46:47 ajacoutot Exp $

    SUBDIR =
-    SUBDIR += libical
    SUBDIR += libvmime
-    SUBDIR += webaccess
    SUBDIR += zarafa

 .include <bsd.port.subdir.mk>
--- a/mail/zarafa/libical/Makefile
+++ b/mail/zarafa/libical/Makefile
@ -1,29 +0,0 @@
-# $OpenBSD: Makefile,v 1.7 2010/03/21 11:08:53 ajacoutot Exp $
-
-COMMENT=	modified libical library for Zarafa
-
-DISTNAME=	libical-0.44
-PKGNAME=	zarafa-${DISTNAME}p0
-
-# We patched the source to rename the libraries so that this package can
-# cohabitate with the "official" one (i.e. textproc/libical).
-SHARED_LIBS+=	ical-zarafa	2.0 # .44.0
-SHARED_LIBS+=	icalss-zarafa	2.0 # .44.0
-SHARED_LIBS+=	icalvcal-zarafa	2.0 # .44.0
-
-CATEGORIES=	textproc
-
-USE_LIBTOOL=	Yes
-
-CONFIGURE_STYLE=gnu
-CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--includedir=${PREFIX}/include/zarafa \
-		--enable-python=no \
-		--enable-java=no \
-		--enable-cxx=no \
-		--without-bdb4
-
-REGRESS_DEPENDS= ::${BASE_PKGPATH}
-REGRESS_FLAGS=	CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include/zarafa"
-
-.include <bsd.port.mk>
--- a/mail/zarafa/libical/distinfo
+++ b/mail/zarafa/libical/distinfo
@ -1,5 +0,0 @@
-MD5 (zarafa/libical-0.44.tar.gz) = 4EA8MeHtglaTJWhfjBWVnA==
-RMD160 (zarafa/libical-0.44.tar.gz) = VkD/0/8BgH5J2QkAAFEMSVkhjDk=
-SHA1 (zarafa/libical-0.44.tar.gz) = 94EVDi2YgG6Rt+C+4Cq9xrr5rH0=
-SHA256 (zarafa/libical-0.44.tar.gz) = IKR1Dfj03t1xi1URe4NRmJ4N+krSyWajg1UO1D5qctg=
-SIZE (zarafa/libical-0.44.tar.gz) = 1149067
--- a/mail/zarafa/libical/patches/patch-configure
+++ b/mail/zarafa/libical/patches/patch-configure
@ -1,52 +0,0 @@
-$OpenBSD: patch-configure,v 1.3 2010/03/21 11:08:53 ajacoutot Exp $
-
-Don't use built-in timezone, but the system one.
-
--- configure.orig	Sun Sep 27 04:40:12 2009
-+++ configure	Wed Feb  3 10:15:18 2010
-@@ -1909,7 +1909,7 @@ fi
- 
- 
- # Define the identity of the package.
- PACKAGE='libical'
-+ PACKAGE='zarafa-libical'
-  VERSION='0.44'
- 
- 
-@@ -19096,6 +19096,10 @@ case "$host" in
-     use_builtin_timezone=no
-     os_win32=no
-     ;;
-+*openbsd*)
-+    use_builtin_timezone=no
-+    os_win32=no
-+    ;;
- *)
-     use_builtin_timezone=yes
-     os_win32=no
-@@ -19579,13 +19583,13 @@ _ACEOF
- 		PTHREAD_LIBS=-pthread;;
- 
- 	*)
-	echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6
-+	echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
-+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6
- if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
-   echo $ECHO_N "(cached) $ECHO_C" >&6
- else
-   ac_check_lib_save_LIBS=$LIBS
-LIBS="-lpthread  $LIBS"
-+LIBS="-pthread  $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h.  */
- _ACEOF
-@@ -19653,7 +19657,7 @@ cat >>confdefs.h <<\_ACEOF
- #define HAVE_PTHREAD
- _ACEOF
- 
-	   PTHREAD_LIBS=-lpthread
-+	   PTHREAD_LIBS=-pthread
- 	fi;;
- esac
- 
--- a/mail/zarafa/libical/patches/patch-examples_Makefile_in
+++ b/mail/zarafa/libical/patches/patch-examples_Makefile_in
@ -1,33 +0,0 @@
-$OpenBSD: patch-examples_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $
--- examples/Makefile.in.orig	Wed Nov 18 11:18:18 2009
-+++ examples/Makefile.in	Wed Nov 18 11:20:09 2009
-@@ -52,12 +52,12 @@ am_doesnothing_OBJECTS = access_components.$(OBJEXT) \
- 	access_properties_and_parameters.$(OBJEXT) errors.$(OBJEXT) \
- 	main.$(OBJEXT) parse_text.$(OBJEXT)
- doesnothing_OBJECTS = $(am_doesnothing_OBJECTS)
-@WITH_BDB4_FALSE@doesnothing_DEPENDENCIES = ../src/libical/libical.la \
-@WITH_BDB4_FALSE@	../src/libicalss/libicalss.la \
-@WITH_BDB4_FALSE@	../src/libicalvcal/libicalvcal.la
-@WITH_BDB4_TRUE@doesnothing_DEPENDENCIES = ../src/libical/libical.la \
-@WITH_BDB4_TRUE@	../src/libicalss/libicalss.la \
-@WITH_BDB4_TRUE@	../src/libicalvcal/libicalvcal.la
-+@WITH_BDB4_FALSE@doesnothing_DEPENDENCIES = ../src/libical/libical-zarafa.la \
-+@WITH_BDB4_FALSE@	../src/libicalss/libicalss-zarafa.la \
-+@WITH_BDB4_FALSE@	../src/libicalvcal/libicalvcal-zarafa.la
-+@WITH_BDB4_TRUE@doesnothing_DEPENDENCIES = ../src/libical/libical-zarafa.la \
-+@WITH_BDB4_TRUE@	../src/libicalss/libicalss-zarafa.la \
-+@WITH_BDB4_TRUE@	../src/libicalvcal/libicalvcal-zarafa.la
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -214,8 +214,8 @@ target_alias = @target_alias@
- target_cpu = @target_cpu@
- target_os = @target_os@
- target_vendor = @target_vendor@
-@WITH_BDB4_FALSE@doesnothing_LDADD = ../src/libical/libical.la ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la
-@WITH_BDB4_TRUE@doesnothing_LDADD = ../src/libical/libical.la ../src/libicalss/libicalss.la ../src/libicalvcal/libicalvcal.la @BDB_DIR_LIB@/@BDB_LIB@
-+@WITH_BDB4_FALSE@doesnothing_LDADD = ../src/libical/libical-zarafa.la ../src/libicalss/libicalss-zarafa.la ../src/libicalvcal/libicalvcal-zarafa.la
-+@WITH_BDB4_TRUE@doesnothing_LDADD = ../src/libical/libical-zarafa.la ../src/libicalss/libicalss-zarafa.la ../src/libicalvcal/libicalvcal-zarafa.la @BDB_DIR_LIB@/@BDB_LIB@
- INCLUDES = -I. -I../src  -I../src/libical -I$(srcdir)/../src/libical -I../src/libicalss -I../src/libicalvcal 
- doesnothing_SOURCES = \
- 	access_components.c \
--- a/mail/zarafa/libical/patches/patch-src_libical_Makefile_in
+++ b/mail/zarafa/libical/patches/patch-src_libical_Makefile_in
@ -1,28 +0,0 @@
-$OpenBSD: patch-src_libical_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $
--- src/libical/Makefile.in.orig	Sun Sep 27 04:40:09 2009
-+++ src/libical/Makefile.in	Wed Nov 18 11:20:48 2009
-@@ -307,10 +307,10 @@ target_vendor = @target_vendor@
- DESIGNDATA = $(top_srcdir)/design-data
- ICALSCRIPTS = $(top_srcdir)/scripts
- @WITH_CXX_BINDINGS_FALSE@cxx_lib = 
-@WITH_CXX_BINDINGS_TRUE@cxx_lib = libical_cxx.la
-+@WITH_CXX_BINDINGS_TRUE@cxx_lib = libical_cxx-zarafa.la
- @WITH_CXX_BINDINGS_FALSE@cxx_headers = 
- @WITH_CXX_BINDINGS_TRUE@cxx_headers = vcomponent.h icalparameter_cxx.h icalproperty_cxx.h icalvalue_cxx.h icptrholder.h
-lib_LTLIBRARIES = libical.la $(cxx_lib)
-+lib_LTLIBRARIES = libical-zarafa.la $(cxx_lib)
- noinst_LTLIBRARIES = libical-static.la
- libical_static_la_SOURCES = $(libical_la_SOURCES)
- libical_static_la_LDFLAGS = --all-static
-@@ -587,9 +587,9 @@ clean-noinstLTLIBRARIES:
- 	done
- libical-static.la: $(libical_static_la_OBJECTS) $(libical_static_la_DEPENDENCIES) 
- 	$(LINK)  $(libical_static_la_LDFLAGS) $(libical_static_la_OBJECTS) $(libical_static_la_LIBADD) $(LIBS)
-libical.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES) 
-+libical-zarafa.la: $(libical_la_OBJECTS) $(libical_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(libdir) $(libical_la_LDFLAGS) $(libical_la_OBJECTS) $(libical_la_LIBADD) $(LIBS)
-libical_cxx.la: $(libical_cxx_la_OBJECTS) $(libical_cxx_la_DEPENDENCIES) 
-+libical_cxx-zarafa.la: $(libical_cxx_la_OBJECTS) $(libical_cxx_la_DEPENDENCIES) 
- 	$(CXXLINK) $(am_libical_cxx_la_rpath) $(libical_cxx_la_LDFLAGS) $(libical_cxx_la_OBJECTS) $(libical_cxx_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--- a/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c
+++ b/mail/zarafa/libical/patches/patch-src_libical_icaltz-util_c
@ -1,51 +0,0 @@
-$OpenBSD: patch-src_libical_icaltz-util_c,v 1.2 2009/11/18 13:54:52 ajacoutot Exp $
--- src/libical/icaltz-util.c.orig	Sat Oct 10 18:09:08 2009
-+++ src/libical/icaltz-util.c	Sat Oct 10 18:24:28 2009
-@@ -27,6 +27,14 @@
- 
- #if defined(sun) && defined(__SVR4)
- #include <sys/byteorder.h>
-+#elif defined(__OpenBSD__)
-+#include <sys/types.h>
-+#define __BYTE_ORDER	_BYTE_ORDER
-+#define __LITTLE_ENDIAN	_LITTLE_ENDIAN
-+#define __BIG_ENDIAN	_BIG_ENDIAN
-+#define bswap_16	swap16
-+#define bswap_32	swap32
-+#define bswap_64	swap64
- #else
- # ifdef HAVE_BYTESWAP_H
- #  include <byteswap.h>
-@@ -132,6 +140,8 @@ decode (const void *ptr)
-     if (sizeof (int) == 4)
- #ifdef _BIG_ENDIAN
-         return *(const int *) ptr;
-+#elif __OpenBSD__
-+	return swap32 (*(const uint32_t *) ptr);
- #else
-         return BSWAP_32 (*(const int *) ptr);
- #endif
-@@ -426,7 +436,10 @@ icaltzutil_fetch_timezone (const char *location)
- 		else
- 			zp_idx = zidx;
- 		/* DTSTART localtime uses TZOFFSETFROM UTC offset */
-		trans = transitions [stdidx] + types [zp_idx].gmtoff;
-+		if (num_trans)
-+			trans = transitions [stdidx] + types [zidx].gmtoff;
-+		else
-+			trans = types [zidx].gmtoff;
- 		icaltime = icaltime_from_timet (trans, 0);
- 		dtstart = icaltime;
- 		dtstart.year = 1970;
-@@ -465,7 +478,10 @@ icaltzutil_fetch_timezone (const char *location)
- 		icalcomponent_add_property (dst_comp, icalprop);
- 
- 		/* DTSTART localtime uses TZOFFSETFROM UTC offset */
-		trans = transitions [dstidx] + types [zp_idx].gmtoff;
-+		if (num_trans)
-+			trans = transitions [dstidx] + types [zidx].gmtoff;
-+		else
-+			trans = types [zidx].gmtoff;
- 		icaltime = icaltime_from_timet (trans, 0);
- 		dtstart = icaltime;
- 		dtstart.year = 1970;
--- a/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in
+++ b/mail/zarafa/libical/patches/patch-src_libicalss_Makefile_in
@ -1,28 +0,0 @@
-$OpenBSD: patch-src_libicalss_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $
--- src/libicalss/Makefile.in.orig	Sun Sep 27 04:40:09 2009
-+++ src/libicalss/Makefile.in	Wed Nov 18 11:20:48 2009
-@@ -295,10 +295,10 @@ AM_LFLAGS = -Pss -L -R
- @WITH_BDB4_TRUE@libicalssinclude_BDBHEADERS = icalbdbset.h icalbdbsetimpl.h
- @WITH_BDB4_TRUE@BDB_LIBFILES = @BDB_DIR_LIB@/@BDB_LIB@
- @WITH_CXX_BINDINGS_FALSE@cxx_lib = 
-@WITH_CXX_BINDINGS_TRUE@cxx_lib = libicalss_cxx.la
-+@WITH_CXX_BINDINGS_TRUE@cxx_lib = libicalss_cxx-zarafa.la
- @WITH_CXX_BINDINGS_FALSE@cxx_headers = 
- @WITH_CXX_BINDINGS_TRUE@cxx_headers = icalspanlist_cxx.h
-lib_LTLIBRARIES = libicalss.la $(cxx_lib)
-+lib_LTLIBRARIES = libicalss-zarafa.la $(cxx_lib)
- INCLUDES = \
- 	-I$(top_srcdir)/src	\
- 	-I$(top_builddir)/src	\
-@@ -422,9 +422,9 @@ icalssyacc.h: icalssyacc.c
- 	  rm -f icalssyacc.c; \
- 	  $(MAKE) icalssyacc.c; \
- 	else :; fi
-libicalss.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES) 
-+libicalss-zarafa.la: $(libicalss_la_OBJECTS) $(libicalss_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(libdir) $(libicalss_la_LDFLAGS) $(libicalss_la_OBJECTS) $(libicalss_la_LIBADD) $(LIBS)
-libicalss_cxx.la: $(libicalss_cxx_la_OBJECTS) $(libicalss_cxx_la_DEPENDENCIES) 
-+libicalss_cxx-zarafa.la: $(libicalss_cxx_la_OBJECTS) $(libicalss_cxx_la_DEPENDENCIES) 
- 	$(CXXLINK) $(am_libicalss_cxx_la_rpath) $(libicalss_cxx_la_LDFLAGS) $(libicalss_cxx_la_OBJECTS) $(libicalss_cxx_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--- a/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in
+++ b/mail/zarafa/libical/patches/patch-src_libicalvcal_Makefile_in
@ -1,39 +0,0 @@
-$OpenBSD: patch-src_libicalvcal_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $
--- src/libicalvcal/Makefile.in.orig	Sun Sep 27 04:40:10 2009
-+++ src/libicalvcal/Makefile.in	Wed Nov 18 11:21:59 2009
-@@ -58,7 +58,7 @@ am__installdirs = "$(DESTDIR)$(libdir)" \
- 	"$(DESTDIR)$(libicalvcalincludedir)"
- libLTLIBRARIES_INSTALL = $(INSTALL)
- LTLIBRARIES = $(lib_LTLIBRARIES)
-libicalvcal_la_DEPENDENCIES = ../libical/.libs/libical.la
-+libicalvcal_la_DEPENDENCIES = ../libical/.libs/libical-zarafa.la
- am__libicalvcal_la_SOURCES_DIST = icalvcal.h icalvcal.c port.h vcc.h \
- 	vobject.h vobject.c vcaltmp.h vcaltmp.c vcc.c vcc.y
- @DEV_FALSE@am__objects_1 = vcc.lo
-@@ -229,7 +229,7 @@ target_os = @target_os@
- target_vendor = @target_vendor@
- AM_YFLAGS = -l
- AM_LFLAGS = -L -R
-lib_LTLIBRARIES = libicalvcal.la
-+lib_LTLIBRARIES = libicalvcal-zarafa.la
- INCLUDES = \
- 	-I$(top_srcdir)			\
- 	-I$(top_srcdir)/src		\
-@@ -239,7 +239,7 @@ INCLUDES = \
- 	-I$(top_srcdir)/src/libicalss
- 
- libicalvcal_la_LDFLAGS = -version-info 44:0:44
-libicalvcal_la_LIBADD = ../libical/.libs/libical.la
-+libicalvcal_la_LIBADD = ../libical/.libs/libical-zarafa.la
- @DEV_FALSE@libicalvcal_la_DEVSOURCES = vcc.c
- @DEV_TRUE@libicalvcal_la_DEVSOURCES = vcc.y
- libicalvcal_la_SOURCES = \
-@@ -326,7 +326,7 @@ clean-libLTLIBRARIES:
- 	  echo "rm -f \"$${dir}/so_locations\""; \
- 	  rm -f "$${dir}/so_locations"; \
- 	done
-libicalvcal.la: $(libicalvcal_la_OBJECTS) $(libicalvcal_la_DEPENDENCIES) 
-+libicalvcal-zarafa.la: $(libicalvcal_la_OBJECTS) $(libicalvcal_la_DEPENDENCIES) 
- 	$(LINK) -rpath $(libdir) $(libicalvcal_la_LDFLAGS) $(libicalvcal_la_OBJECTS) $(libicalvcal_la_LIBADD) $(LIBS)
- 
- mostlyclean-compile:
--- a/mail/zarafa/libical/patches/patch-src_test_Makefile_in
+++ b/mail/zarafa/libical/patches/patch-src_test_Makefile_in
@ -1,111 +0,0 @@
-$OpenBSD: patch-src_test_Makefile_in,v 1.3 2009/11/18 13:54:52 ajacoutot Exp $
--- src/test/Makefile.in.orig	Sun Sep 27 04:40:10 2009
-+++ src/test/Makefile.in	Wed Nov 18 11:20:48 2009
-@@ -57,29 +57,29 @@ copycluster_SOURCES = copycluster.c
- copycluster_OBJECTS = copycluster.$(OBJEXT)
- copycluster_LDADD = $(LDADD)
- @WITH_CXX_BINDINGS_TRUE@am__DEPENDENCIES_1 =  \
-@WITH_CXX_BINDINGS_TRUE@	../libical/libical_cxx.la
-+@WITH_CXX_BINDINGS_TRUE@	../libical/libical_cxx-zarafa.la
- am__DEPENDENCIES_2 =
-copycluster_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+copycluster_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- am_parser_OBJECTS = icaltestparser.$(OBJEXT)
- parser_OBJECTS = $(am_parser_OBJECTS)
- parser_LDADD = $(LDADD)
-parser_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+parser_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- process_SOURCES = process.c
- process_OBJECTS = process.$(OBJEXT)
- process_LDADD = $(LDADD)
-process_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+process_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- recur_SOURCES = recur.c
- recur_OBJECTS = recur.$(OBJEXT)
- recur_LDADD = $(LDADD)
-recur_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+recur_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- am__regression_SOURCES_DIST = regression.c regression.h \
- 	regression-component.c regression-classify.c \
- 	regression-utils.c regression-recur.c regression-storage.c \
-@@ -91,33 +91,33 @@ am_regression_OBJECTS = regression.$(OBJEXT) \
- 	regression-storage.$(OBJEXT) $(am__objects_1)
- regression_OBJECTS = $(am_regression_OBJECTS)
- regression_LDADD = $(LDADD)
-regression_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+regression_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- stow_SOURCES = stow.c
- stow_OBJECTS = stow.$(OBJEXT)
- stow_LDADD = $(LDADD)
-stow_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+stow_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- testmime_SOURCES = testmime.c
- testmime_OBJECTS = testmime.$(OBJEXT)
- testmime_LDADD = $(LDADD)
-testmime_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+testmime_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- testvcal_SOURCES = testvcal.c
- testvcal_OBJECTS = testvcal.$(OBJEXT)
- testvcal_LDADD = $(LDADD)
-testvcal_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+testvcal_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- timezones_SOURCES = timezones.c
- timezones_OBJECTS = timezones.$(OBJEXT)
- timezones_LDADD = $(LDADD)
-timezones_DEPENDENCIES = ../libicalss/libicalss.la \
-	../libicalvcal/libicalvcal.la $(am__DEPENDENCIES_1) \
-	../libical/libical.la $(am__DEPENDENCIES_2)
-+timezones_DEPENDENCIES = ../libicalss/libicalss-zarafa.la \
-+	../libicalvcal/libicalvcal-zarafa.la $(am__DEPENDENCIES_1) \
-+	../libical/libical-zarafa.la $(am__DEPENDENCIES_2)
- DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
- depcomp = $(SHELL) $(top_srcdir)/depcomp
- am__depfiles_maybe = depfiles
-@@ -291,13 +291,13 @@ regression_SOURCES = regression.c regression.h regress
- @WITH_CXX_BINDINGS_FALSE@cxx_inc = 
- @WITH_CXX_BINDINGS_TRUE@cxx_inc = -DWITH_CXX_BINDINGS
- @WITH_CXX_BINDINGS_FALSE@cxx_libs = 
-@WITH_CXX_BINDINGS_TRUE@cxx_libs = ../libical/libical_cxx.la
-+@WITH_CXX_BINDINGS_TRUE@cxx_libs = ../libical/libical_cxx-zarafa.la
- @WITH_BDB4_FALSE@bdb4_inc = 
- @WITH_BDB4_TRUE@bdb4_inc = -DWITH_BDB -I@BDB_DIR@/include
- @WITH_BDB4_FALSE@bdb4_libs = 
- @WITH_BDB4_TRUE@bdb4_libs = @BDB_DIR_LIB@/@BDB_LIB@
- @OS_WIN32_FALSE@STOW = stow
-LDADD = ../libicalss/libicalss.la ../libicalvcal/libicalvcal.la $(cxx_libs) ../libical/libical.la $(bdb4_libs)
-+LDADD = ../libicalss/libicalss-zarafa.la ../libicalvcal/libicalvcal-zarafa.la $(cxx_libs) ../libical/libical-zarafa.la $(bdb4_libs)
- INCLUDES = \
- 	-I$(top_srcdir)					\
- 	-I$(top_srcdir)/src				\
--- a/mail/zarafa/libical/pkg/DESCR
+++ b/mail/zarafa/libical/pkg/DESCR
@ -1,3 +0,0 @@
-libical implements basic iCAL protocols.
-This is a modified libical library for use with the Zarafa Outlook
-Sharing service.
--- a/mail/zarafa/libical/pkg/PLIST
+++ b/mail/zarafa/libical/pkg/PLIST
@ -1,60 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.3 2010/03/21 11:08:53 ajacoutot Exp $
-include/zarafa/
-include/zarafa/ical.h
-include/zarafa/libical/
-include/zarafa/libical/ical.h
-include/zarafa/libical/icalarray.h
-include/zarafa/libical/icalattach.h
-include/zarafa/libical/icalcalendar.h
-include/zarafa/libical/icalclassify.h
-include/zarafa/libical/icalcluster.h
-include/zarafa/libical/icalcomponent.h
-include/zarafa/libical/icalderivedparameter.h
-include/zarafa/libical/icalderivedproperty.h
-include/zarafa/libical/icalderivedvalue.h
-include/zarafa/libical/icaldirset.h
-include/zarafa/libical/icaldirsetimpl.h
-include/zarafa/libical/icalduration.h
-include/zarafa/libical/icalenums.h
-include/zarafa/libical/icalerror.h
-include/zarafa/libical/icalfileset.h
-include/zarafa/libical/icalfilesetimpl.h
-include/zarafa/libical/icalgauge.h
-include/zarafa/libical/icalgaugeimpl.h
-include/zarafa/libical/icallangbind.h
-include/zarafa/libical/icalmemory.h
-include/zarafa/libical/icalmessage.h
-include/zarafa/libical/icalmime.h
-include/zarafa/libical/icalparameter.h
-include/zarafa/libical/icalparser.h
-include/zarafa/libical/icalperiod.h
-include/zarafa/libical/icalproperty.h
-include/zarafa/libical/icalrecur.h
-include/zarafa/libical/icalrestriction.h
-include/zarafa/libical/icalset.h
-include/zarafa/libical/icalspanlist.h
-include/zarafa/libical/icalss.h
-include/zarafa/libical/icalssyacc.h
-include/zarafa/libical/icaltime.h
-include/zarafa/libical/icaltimezone.h
-include/zarafa/libical/icaltypes.h
-include/zarafa/libical/icaltz-util.h
-include/zarafa/libical/icalvalue.h
-include/zarafa/libical/icalvcal.h
-include/zarafa/libical/port.h
-include/zarafa/libical/pvl.h
-include/zarafa/libical/sspm.h
-include/zarafa/libical/vcaltmp.h
-include/zarafa/libical/vcc.h
-include/zarafa/libical/vobject.h
-lib/libical-zarafa.a
-lib/libical-zarafa.la
-@lib lib/libical-zarafa.so.${LIBical-zarafa_VERSION}
-lib/libicalss-zarafa.a
-lib/libicalss-zarafa.la
-@lib lib/libicalss-zarafa.so.${LIBicalss-zarafa_VERSION}
-lib/libicalvcal-zarafa.a
-lib/libicalvcal-zarafa.la
-@lib lib/libicalvcal-zarafa.so.${LIBicalvcal-zarafa_VERSION}
-@comment lib/pkgconfig/
-@comment lib/pkgconfig/libical.pc
--- a/mail/zarafa/libvmime/Makefile
+++ b/mail/zarafa/libvmime/Makefile
@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.6 2010/03/21 11:09:51 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.7 2010/06/30 02:46:47 ajacoutot Exp $

 COMMENT=	modified libvmime library for Zarafa

@ -8,7 +8,7 @@ PKGNAME=	zarafa-${DISTNAME}p4
 # patches are modified in the upstream tarball without notice nor
 # version bump, so we use this to force a new download instead of
 # failing because of checksum mismatch
-DIST_SUBDIR=	zarafa/vmime-patches-20090320
+DIST_SUBDIR=	zarafa/libvmime-20100630

 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		zarafa-vmime-patches.tar.gz
--- a/mail/zarafa/libvmime/distinfo
+++ b/mail/zarafa/libvmime/distinfo
@ -1,10 +1,10 @@
-MD5 (zarafa/vmime-patches-20090320/libvmime-0.7.1.tar.bz2) = gfBqdx0t4B1ZgmNYOOtfag==
-MD5 (zarafa/vmime-patches-20090320/zarafa-vmime-patches.tar.gz) = ISUarFaN1BH/lNRhIX2z5g==
-RMD160 (zarafa/vmime-patches-20090320/libvmime-0.7.1.tar.bz2) = JZmDyIRBCMgEC8uuLqU+RTqBESQ=
-RMD160 (zarafa/vmime-patches-20090320/zarafa-vmime-patches.tar.gz) = 64pQRlUwQTh2Q+cruw3vmC8AGsk=
-SHA1 (zarafa/vmime-patches-20090320/libvmime-0.7.1.tar.bz2) = MP773THC+kaXaYTxjU0hvzwuwgo=
-SHA1 (zarafa/vmime-patches-20090320/zarafa-vmime-patches.tar.gz) = jWd1moPlp0bbWUa/iUn381MceK4=
-SHA256 (zarafa/vmime-patches-20090320/libvmime-0.7.1.tar.bz2) = /DR2rsVlNBWUx8TcqYJTlpW2HsuSpDjxmGDpEwygGeM=
-SHA256 (zarafa/vmime-patches-20090320/zarafa-vmime-patches.tar.gz) = HT2bO0Qh3A75vm20yorYhX5CvWeJhxoVf1lTBl8nzNU=
-SIZE (zarafa/vmime-patches-20090320/libvmime-0.7.1.tar.bz2) = 418302
-SIZE (zarafa/vmime-patches-20090320/zarafa-vmime-patches.tar.gz) = 11217
+MD5 (zarafa/libvmime-20100630/libvmime-0.7.1.tar.bz2) = gfBqdx0t4B1ZgmNYOOtfag==
+MD5 (zarafa/libvmime-20100630/zarafa-vmime-patches.tar.gz) = qSr/MpSCn5wnDqBZKeYZ0Q==
+RMD160 (zarafa/libvmime-20100630/libvmime-0.7.1.tar.bz2) = JZmDyIRBCMgEC8uuLqU+RTqBESQ=
+RMD160 (zarafa/libvmime-20100630/zarafa-vmime-patches.tar.gz) = 231T54diCPj2vXc8KDULg0pWwLQ=
+SHA1 (zarafa/libvmime-20100630/libvmime-0.7.1.tar.bz2) = MP773THC+kaXaYTxjU0hvzwuwgo=
+SHA1 (zarafa/libvmime-20100630/zarafa-vmime-patches.tar.gz) = uFw7aiXrXSBCmlUyxSsB5UVJ99I=
+SHA256 (zarafa/libvmime-20100630/libvmime-0.7.1.tar.bz2) = /DR2rsVlNBWUx8TcqYJTlpW2HsuSpDjxmGDpEwygGeM=
+SHA256 (zarafa/libvmime-20100630/zarafa-vmime-patches.tar.gz) = 9urLoMjn8z7nuams+eobIw0gXI2kcQYz48US2QLmDX0=
+SIZE (zarafa/libvmime-20100630/libvmime-0.7.1.tar.bz2) = 418302
+SIZE (zarafa/libvmime-20100630/zarafa-vmime-patches.tar.gz) = 12326
--- a/mail/zarafa/webaccess/Makefile
+++ b/mail/zarafa/webaccess/Makefile
@ -1,37 +0,0 @@
-# $OpenBSD: Makefile,v 1.24 2010/06/03 14:02:09 ajacoutot Exp $
-
-COMMENT=	zarafa webaccess frontend
-
-V=		6.30.14
-DISTNAME=	zarafa-webaccess-ajax-${V}
-PKGNAME=	zarafa-webaccess-${V}p0
-
-CATEGORIES=	mail www productivity
-
-MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/zarafa/
-
-RUN_DEPENDS=	::mail/zarafa/zarafa,-php
-
-NO_BUILD=	Yes
-NO_REGRESS=	Yes
-PKG_ARCH=	*
-
-PREFIX=		/var/www
-INSTDIR=	${PREFIX}/zarafa-webaccess
-SUBST_VARS=	INSTDIR
-
-WRKDIST=	${WRKDIR}
-
-do-install:
-	${SUBST_CMD} ${WRKDIR}/php-webclient-ajax/config.php.dist
-	find ${WRKDIR} -name \*.orig -or -name \*.bak | xargs rm -f
-	mv ${WRKDIR}/php-webclient-ajax ${INSTDIR}
-	mv ${INSTDIR}/debug.php \
-		${INSTDIR}/debug.php.disabled
-	mv ${INSTDIR}/client/layout/img/login.jpg \
-		${INSTDIR}/client/layout/img/_login.jpg
-	${INSTALL_DATA} /dev/null ${INSTDIR}/debug.txt 
-	chown -R ${SHAREOWN}:${SHAREGRP} ${INSTDIR}
-	find ${PREFIX} -name \*.beforesubst -exec rm {} \;
-
-.include <bsd.port.mk>
--- a/mail/zarafa/webaccess/distinfo
+++ b/mail/zarafa/webaccess/distinfo
@ -1,5 +0,0 @@
-MD5 (zarafa/zarafa-webaccess-ajax-6.30.14.tar.gz) = kU3CAOX/37jMHqeX2RSXMA==
-RMD160 (zarafa/zarafa-webaccess-ajax-6.30.14.tar.gz) = RilccmfcvKGvv23+OvT9yHZ1GR0=
-SHA1 (zarafa/zarafa-webaccess-ajax-6.30.14.tar.gz) = yu8TX2o6dK9ow9UchTu6WC+hNAo=
-SHA256 (zarafa/zarafa-webaccess-ajax-6.30.14.tar.gz) = LuV+4woaBBzpkPI9jRaiHVOM/XMbibLg6fC9eXzSqBU=
-SIZE (zarafa/zarafa-webaccess-ajax-6.30.14.tar.gz) = 1587179
--- a/mail/zarafa/zarafa/Makefile
+++ b/mail/zarafa/zarafa/Makefile
@ -1,28 +1,29 @@
-# $OpenBSD: Makefile,v 1.37 2010/06/03 14:01:57 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.38 2010/06/30 02:46:48 ajacoutot Exp $

 COMMENT-main=	MS Exchange groupware suite replacement
-COMMENT-php=	MAPI extensions for php5
+COMMENT-web=	zarafa webaccess frontend and MAPI extensions for PHP

-V=		6.30.14
+V=		6.40.0
 DISTNAME=	zarafa-${V}

-PKGNAME-main=	${DISTNAME}p1
-PKGNAME-php=	php5-mapi-${V}
+PKGNAME-main=	${DISTNAME}
+PKGNAME-web=	zarafa-webaccess-${V}

 CATEGORIES=	mail www productivity

 MASTER_SITES=	http://www.bsdfrog.org/OpenBSD/distfiles/zarafa/

-SHARED_LIBS +=  common_util	0.0 # .1.0
-SHARED_LIBS +=  common_mapi	0.0 # .1.0
-SHARED_LIBS +=  common_ssl	0.0 # .1.0
-SHARED_LIBS +=  freebusy	0.0 # .1.0
-SHARED_LIBS +=  mapi		0.0 # .0.0
-SHARED_LIBS +=  zarafaclient	0.0 # .1.0
-SHARED_LIBS +=  icalmapi	0.0 # .1.0
-SHARED_LIBS +=  inetmapi	0.1 # .1.0
+SHARED_LIBS +=  common_util	1.0 # .1.0
+SHARED_LIBS +=  common_mapi	1.0 # .1.0
+SHARED_LIBS +=  common_ssl	1.0 # .1.0
+SHARED_LIBS +=  freebusy	1.0 # .1.0
+SHARED_LIBS +=  mapi		1.0 # .0.0
+SHARED_LIBS +=  zarafaclient	1.0 # .1.0
+SHARED_LIBS +=  icalmapi	1.0 # .1.0
+SHARED_LIBS +=  inetmapi	1.0 # .1.0
+SHARED_LIBS +=  zarafasync	1.0 # .1.0

-MULTI_PACKAGES=	-main -php
+MULTI_PACKAGES=	-main -web

 MODULES=	devel/gettext

@ -39,41 +40,49 @@ LIB_DEPENDS-main= ${MODGETTEXT_LIB_DEPENDS} \
 		uuid.>=13::devel/uuid \
 		execinfo::devel/libexecinfo \
 		vmime-zarafa:zarafa-libvmime->=0.7.1p3:mail/zarafa/libvmime \
-		ical-zarafa.>=2,icalss-zarafa.>=2::mail/zarafa/libical
+		ical.>=1,icalss::textproc/libical

-WANTLIB-php=	execinfo ical-zarafa icalss-zarafa \
-		uuid vmime-zarafa
-LIB_DEPENDS-php= ${MODGETTEXT_LIB_DEPENDS} \
+WANTLIB-web=	execinfo ical icalss uuid vmime-zarafa
+LIB_DEPENDS-web= ${MODGETTEXT_LIB_DEPENDS} \
 		common_mapi,common_util,freebusy,icalmapi,inetmapi,mapi::mail/zarafa/zarafa,-main
-RUN_DEPENDS-php= ::www/php5/core
+RUN_DEPENDS-web= ::www/php5/core

 USE_LIBTOOL=	Yes
 LIBTOOL_FLAGS=	--tag=disable-static

 USE_GMAKE=	Yes

-PREFIX-php=	/var/www
+WEBROOT=	/var/www
+
+PREFIX-web=	${WEBROOT}
+INSTDIR=	${PREFIX-web}/zarafa-webaccess
 MODULE_NAME=	mapi
-SUBST_VARS=	^MODULE_NAME PREFIX-php
+
+SUBST_VARS=	^MODULE_NAME INSTDIR PREFIX-web

 CONFIGURE_STYLE= gnu
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include \
 			-I${LOCALBASE}/include/zarafa" \
 		LDFLAGS="-L${LOCALBASE}/lib -lexecinfo \
 			-L${LOCALBASE}/lib/zarafa" \
-		ZAFARA_LDFLAGS="-L${LOCALBASE}/lib/zarafa"
+		ZAFARA_LDFLAGS="-L${LOCALBASE}/lib/zarafa" \
+		PHP_SYSCONF_DIR="${PREFIX-web}/conf/php5"
 CONFIGURE_ARGS=	${CONFIGURE_SHARED} \
-		--enable-dependency-tracking \
 		--disable-static \
+		--disable-perl \
 		--with-userscript-prefix=${SYSCONFDIR}/zarafa/userscripts \
 		--with-quotatemplate-prefix=${SYSCONFDIR}/zarafa/quotamail \
+		--enable-dependency-tracking \
 		--enable-release \
 		--enable-oss \
-		--disable-perl \
+		--with-distro=openbsd \
 		--with-vmime-prefix=${LOCALBASE}/include/zarafa \
 		--with-ical-prefix=${LOCALBASE}/include/

-FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples/zarafa/report-ca \
+# XXX in-tree heimdal does not provide krb5_free_unparsed_name()
+CONFIGURE_ARGS+= --with-krb5=/usr/bin/true
+
+FAKE_FLAGS=	sysconfdir=${PREFIX}/share/examples \
 		USERSCRIPTDIR=${PREFIX}/share/examples/zarafa/userscripts \
 		QUOTATEMPLATEDIR=${PREFIX}/share/examples/zarafa/quotamail

@ -81,9 +90,9 @@ SUB_SCRIPTS=	createcompany.d/00createpublic groups_common.sh \
 		createuser.d/00createstore companies_common.sh \
 		users_common.sh

-CONF_FILES=	dagent.cfg gateway.cfg ical.cfg ldap.active-directory.cfg \
-		ldap.openldap.cfg monitor.cfg server.cfg spooler.cfg \
-		unix.cfg
+post-patch:
+	mv ${WRKSRC}/php-webclient-ajax/client/layout/img/login.jpg \
+		${WRKSRC}/php-webclient-ajax/client/layout/img/login.jpg.dist

 pre-configure:
 	cd ${WRKSRC}/installer/linux && \
@ -102,8 +111,17 @@ pre-configure:
 		${WRKSRC}/doc/manual.xml

 post-install:
-	for i in ${CONF_FILES}; do mv ${PREFIX}/share/doc/zarafa/$${i} \
-		${PREFIX}/share/examples/zarafa/; done
+	${SUBST_CMD} ${WRKSRC}/php-webclient-ajax/config.php.dist
+	find ${WRKSRC}/php-webclient-ajax -name \*.orig -or -name \*.bak | xargs rm -f
+	${INSTALL_DATA_DIR} ${WRKINST}${INSTDIR}
+	cd ${WRKSRC}/php-webclient-ajax && tar cf - ./ | \
+		tar -xf - -C ${WRKINST}${INSTDIR}
+	${INSTALL_DATA} ${WRKINST}${INSTDIR}/debug.php \
+		${WRKINST}${INSTDIR}/debug.php.disabled
+	${INSTALL_DATA} /dev/null ${WRKINST}${INSTDIR}/debug.txt 
+	chown -R ${SHAREOWN}:${SHAREGRP} ${WRKINST}${INSTDIR}
+	find ${PREFIX} -name \*.beforesubst -exec rm {} \;
+
 	${SUBST_CMD} -c ${FILESDIR}/README.OpenBSD ${PREFIX}/share/doc/zarafa/README.OpenBSD
 	${SUBST_CMD} -c ${FILESDIR}/zarafa.m4 ${PREFIX}/share/examples/zarafa/zarafa.m4
 	${SUBST_CMD} -c ${FILESDIR}/local_zarafa.m4 ${PREFIX}/share/examples/zarafa/local_zarafa.m4
@ -112,12 +130,12 @@ post-install:
 		${PREFIX}/share/examples/zarafa/local_zarafa.m4
 	chmod ${SHAREMODE} ${PREFIX}/share/examples/zarafa/zarafa.m4 \
 		${PREFIX}/share/examples/zarafa/local_zarafa.m4
-	${INSTALL_DATA_DIR} ${DESTDIR}/${PREFIX-php}/conf/php5.sample
-	echo "; Enable Zarafa mapi extension module\nextension=mapi.so" \
-		> ${WRKINST}/${PREFIX-php}/conf/php5.sample/${MODULE_NAME}.ini
+	${INSTALL_DATA_DIR} ${WRKINST}/${PREFIX-web}/conf/php5.sample
+	${INSTALL_DATA} ${WRKSRC}/php-ext/zarafa.ini \
+		${WRKINST}/${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini.dist
 	mv ${PREFIX}/share/doc/zarafa/zarafa.schema \
 		${PREFIX}/share/examples/zarafa/
-	find ${WRKINST}${PREFIX-php}/include/php/mapi/ -type f \
+	find ${WRKINST}${PREFIX-web}/include/php -type f \
 		-exec perl -pi -e 's,\?php\?,\?php,' {} \;

 .include <bsd.port.mk>
--- a/mail/zarafa/zarafa/distinfo
+++ b/mail/zarafa/zarafa/distinfo
@ -1,5 +1,5 @@
-MD5 (zarafa/zarafa-6.30.14.tar.gz) = +jGD9xAnuAJTc7BfJ6r3Qg==
-RMD160 (zarafa/zarafa-6.30.14.tar.gz) = UuQ9QjZh2eqetSiEenzB2wDcZeQ=
-SHA1 (zarafa/zarafa-6.30.14.tar.gz) = c6AgumHrSWiTRAu3C0yHzR6225A=
-SHA256 (zarafa/zarafa-6.30.14.tar.gz) = gs9YNskOfntgLtYjvsmL6baijO9e3PqYfzKt1PNRy8E=
-SIZE (zarafa/zarafa-6.30.14.tar.gz) = 2354983
+MD5 (zarafa/zarafa-6.40.0.tar.gz) = OJ0ZXrdlnM0FdpIIaG5LDQ==
+RMD160 (zarafa/zarafa-6.40.0.tar.gz) = HZ+XQ82azoIebkFJR/f7daByTt0=
+SHA1 (zarafa/zarafa-6.40.0.tar.gz) = o0gdyJ19CzeqcMEjWmR6jZnRIQk=
+SHA256 (zarafa/zarafa-6.40.0.tar.gz) = eZw6BVgBIjbQkG0TJ5Of5fD/3RbbVfX4vaIDn8K38Bo=
+SIZE (zarafa/zarafa-6.40.0.tar.gz) = 4469591
--- a/mail/zarafa/zarafa/files/README.OpenBSD
+++ b/mail/zarafa/zarafa/files/README.OpenBSD
@ -1,7 +1,8 @@
-$OpenBSD: README.OpenBSD,v 1.11 2010/06/03 14:01:57 ajacoutot Exp $
+$OpenBSD: README.OpenBSD,v 1.12 2010/06/30 02:46:48 ajacoutot Exp $

 *** Upgrading users: refer to zarafa documentation on the web to check
 *** if any particular step is required after upgrading to a new version. 
+    http://doc.zarafa.com/6.40/Administrator_Manual/en-US/html-single/index.html#_performing_the_upgrade

 Post-install/update instructions for Zarafa
 ===========================================
@ -69,12 +70,12 @@ if [ "`pgrep zarafa`" ]; then
 	pkill zarafa-server
 	sleep 5
 	i=0
-	while [ $i -lt 15 ]
+	while [ ${i} -lt 15 ]
 		do
 		if [ "`pgrep zarafa\-`" ]; then
 			pkill zarafa\-
 			sleep 5
-			i=`expr $i + 5`
+			i=`expr ${i} + 5`
 		else
 			i=15
 		fi
@ -129,6 +130,30 @@ The .forward will be automatically generated when a new user is added to
 Zarafa.


+Zarafa webaccess
+----------------
+
+You need to edit the config.php file installed under:
+${INSTDIR} for regular web client access
+
+With Apache, this directory should be granted these permissions:
+    AllowOverride Indexes Options
+
+If you want to debug the webaccess, copy the following file
+   ${INSTDIR}/debug.php.disabled
+to
+   ${INSTDIR}/debug.php
+The debugging output will then be available under:
+   ${INSTDIR}/debug.txt
+
+You can enable the PHP mapi module by creating a symbolic
+link from ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini to
+${PREFIX-web}/conf/php5/${MODULE_NAME}.ini:
+
+ln -fs ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini \
+    ${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
+
+
 The PHP mapi module and OpenBSD Apache
 --------------------------------------

@ -153,3 +178,4 @@ Each zarafa-* command has its corresponding manpage.
 Some documentation is also available on the Internet:
    http://www.zarafa.com/wiki/index.php/Main_Page
    http://www.zarafa.com/content/documentation
+    http://doc.zarafa.com/6.40/Administrator_Manual/en-US/html-single/index.html
--- a/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_ICalTests_ical2mapi_cpp
+++ b/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_ICalTests_ical2mapi_cpp
@ -1,15 +0,0 @@
-$OpenBSD: patch-ECtools_ECTestTools_ICalTests_ical2mapi_cpp,v 1.4 2010/03/21 11:15:20 ajacoutot Exp $
--- ECtools/ECTestTools/ICalTests/ical2mapi.cpp.orig	Tue Jan 26 17:34:49 2010
-+++ ECtools/ECTestTools/ICalTests/ical2mapi.cpp	Wed Feb  3 08:53:18 2010
-@@ -180,9 +180,9 @@ int main(int argc, char *argv[]) {
- 	if (readfile(argv[4], &icalstring))
- 		goto exit;
- 
-	CreateICalToMapi(lpInbox, lpAdrBook, &lpICalToMapi);
-+	CreateICalToMapi(lpInbox, lpAdrBook, true, &lpICalToMapi);
- 
-	hr = lpICalToMapi->ParseICal(icalstring, "UTF-8", "UTC", 0); // assume ical file is in utf-8
-+	hr = lpICalToMapi->ParseICal(icalstring, "UTF-8", "UTC", NULL, 0); // assume ical file is in utf-8
- 	if (FAILED(hr)) {
- 		cerr << "unable to parse" << endl;
- 		goto exit;
--- a/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_IMAPTest_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_IMAPTest_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig	Fri Oct 16 20:39:17 2009
-+++ ECtools/ECTestTools/IMAPTest/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -237,7 +237,7 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+$OpenBSD: patch-ECtools_ECTestTools_IMAPTest_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- ECtools/ECTestTools/IMAPTest/Makefile.in.orig	Mon May 31 16:37:58 2010
+++ ECtools/ECTestTools/IMAPTest/Makefile.in	Mon Jun 14 09:16:43 2010
+@@ -231,7 +231,7 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX
 -IMAPTest_LDADD = -lssl \
 +IMAPTest_LDADD = -lssl -lcrypto \
--- a/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-ECtools_ECTestTools_Makefile_in
@ -0,0 +1,15 @@
+$OpenBSD: patch-ECtools_ECTestTools_Makefile_in,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+
+We have disabled clucene support so don't build the test.
+
+--- ECtools/ECTestTools/Makefile.in.orig	Tue Jun 29 04:28:30 2010
+++ ECtools/ECTestTools/Makefile.in	Tue Jun 29 04:28:39 2010
+@@ -221,7 +221,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = dltest RTFTest HTMLTest searchfolder StreamTest Rules IMAPTest ABookTest TableTest Dump MessageStatusTest notifyd CopyToTest ICSABTest ICSBlackBerry MultiStoreTableTest StatsTest RecurrenceTest ICalTests ThreadTest LuceneTest
+SUBDIRS = dltest RTFTest HTMLTest searchfolder StreamTest Rules IMAPTest ABookTest TableTest Dump MessageStatusTest notifyd CopyToTest ICSABTest ICSBlackBerry MultiStoreTableTest StatsTest RecurrenceTest ICalTests ThreadTest
+ all: all-recursive
+ 
+ .SUFFIXES:
--- a/mail/zarafa/zarafa/patches/patch-ECtools_zarafa-cfgchecker_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-ECtools_zarafa-cfgchecker_Makefile_in
@ -1,9 +1,9 @@
-$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.3 2009/10/21 09:59:54 ajacoutot Exp $
--- ECtools/zarafa-cfgchecker/Makefile.in.orig	Fri Oct 16 20:39:20 2009
-+++ ECtools/zarafa-cfgchecker/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -258,7 +258,9 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+$OpenBSD: patch-ECtools_zarafa-cfgchecker_Makefile_in,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- ECtools/zarafa-cfgchecker/Makefile.in.orig	Mon May 31 16:37:59 2010
+++ ECtools/zarafa-cfgchecker/Makefile.in	Mon Jun 14 09:16:43 2010
+@@ -248,7 +248,9 @@ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX -I${top_srcdir}/common
 -zarafa_cfgchecker_LDADD = ${top_builddir}/common/libcommon_util.la $(PROG_LIBS)
 +zarafa_cfgchecker_LDADD = ${top_builddir}/mapi4linux/src/libmapi.la \
--- a/mail/zarafa/zarafa/patches/patch-common_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-common_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-common_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- common/Makefile.in.orig	Fri Oct 16 20:39:22 2009
-+++ common/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -291,7 +291,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
+$OpenBSD: patch-common_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/Makefile.in.orig	Mon May 31 16:38:00 2010
+++ common/Makefile.in	Mon Jun 14 09:16:43 2010
+@@ -283,7 +283,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
 	-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
 	-I${top_srcdir}/libfreebusy
 
@ -10,7 +10,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
 libcommon_mapi_la_SOURCES = CommonUtil.cpp				\
 			rtfutil.cpp									\
 			codepage.cpp							\
-@@ -306,7 +306,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp				\
+@@ -298,7 +298,7 @@ libcommon_mapi_la_SOURCES = CommonUtil.cpp				\
 			ZarafaCode.cpp								\
 			ECABEntryID.cpp
 
@ -19,7 +19,7 @@ $OpenBSD: patch-common_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
 libcommon_util_la_SOURCES = platform.cpp			\
 			platform.linux.cpp						\
 			md5.cpp									\
-@@ -324,7 +324,7 @@ libcommon_util_la_SOURCES = platform.cpp			\
+@@ -318,7 +318,7 @@ libcommon_util_la_SOURCES = platform.cpp			\
 			RecurrenceState.cpp						\
 			recurrence.cpp
 
--- a/mail/zarafa/zarafa/patches/patch-common_mapi_ptr_mapi_memory_ptr_h
+++ b/mail/zarafa/zarafa/patches/patch-common_mapi_ptr_mapi_memory_ptr_h
@ -0,0 +1,15 @@
+$OpenBSD: patch-common_mapi_ptr_mapi_memory_ptr_h,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/mapi_ptr/mapi_memory_ptr.h.orig	Mon Jun 28 23:34:25 2010
+++ common/mapi_ptr/mapi_memory_ptr.h	Mon Jun 28 23:35:09 2010
+@@ -52,6 +52,11 @@
+ 
+ #include <utility>
+ 
+// _U is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _U
+#endif
+
+ template<typename _T>
+ class mapi_memory_proxy
+ {
--- a/mail/zarafa/zarafa/patches/patch-common_mapi_ptr_mapi_object_ptr_h
+++ b/mail/zarafa/zarafa/patches/patch-common_mapi_ptr_mapi_object_ptr_h
@ -0,0 +1,15 @@
+$OpenBSD: patch-common_mapi_ptr_mapi_object_ptr_h,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/mapi_ptr/mapi_object_ptr.h.orig	Mon Jun 28 23:35:15 2010
+++ common/mapi_ptr/mapi_object_ptr.h	Mon Jun 28 23:35:26 2010
+@@ -56,6 +56,11 @@
+ #include "ECTags.h"
+ #include "mapi_memory_ptr.h"
+ 
+// _P is defined in ctype.h
+#ifdef __OpenBSD__
+#undef _P
+#endif
+
+ // http://tinyurl.com/ydb363n
+ template<typename BaseT, typename DerivedT>
+ class Conversion 
--- a/mail/zarafa/zarafa/patches/patch-common_platform_h
+++ b/mail/zarafa/zarafa/patches/patch-common_platform_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-common_platform_h,v 1.3 2010/03/21 11:15:20 ajacoutot Exp $
--- common/platform.h.orig	Tue Jan 26 17:34:49 2010
-+++ common/platform.h	Wed Feb  3 08:53:18 2010
+$OpenBSD: patch-common_platform_h,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/platform.h.orig	Mon May 31 19:28:57 2010
+++ common/platform.h	Mon Jun 14 09:16:43 2010
@@ -53,9 +53,15 @@
 
   // We have to include this now in case select.h is included too soon.
@ -15,5 +15,5 @@ $OpenBSD: patch-common_platform_h,v 1.3 2010/03/21 11:15:20 ajacoutot Exp $
   #define __FD_SETSIZE 8192
 +#endif
 
-   #include "config.h"
-   #include "platform.linux.h"
+   // Log the pthreads locks
+   #define DEBUG_PTHREADS 0
--- a/mail/zarafa/zarafa/patches/patch-common_platform_linux_cpp
+++ b/mail/zarafa/zarafa/patches/patch-common_platform_linux_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-common_platform_linux_cpp,v 1.3 2010/03/21 11:15:20 ajacoutot Exp $
--- common/platform.linux.cpp.orig	Tue Jan 26 17:34:49 2010
-+++ common/platform.linux.cpp	Wed Feb  3 08:53:18 2010
-@@ -68,7 +68,7 @@
+$OpenBSD: patch-common_platform_linux_cpp,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/platform.linux.cpp.orig	Mon May 31 19:28:57 2010
+++ common/platform.linux.cpp	Mon Jun 14 09:16:43 2010
+@@ -70,7 +70,7 @@
 #define ICONV_CONST const
 #elif OPENBSD
 // bsd
--- a/mail/zarafa/zarafa/patches/patch-common_platform_linux_h
+++ b/mail/zarafa/zarafa/patches/patch-common_platform_linux_h
@ -1,6 +1,6 @@
-$OpenBSD: patch-common_platform_linux_h,v 1.6 2010/06/06 20:10:21 espie Exp $
--- common/platform.linux.h.orig	Tue Apr 27 21:07:02 2010
-+++ common/platform.linux.h	Sun Jun  6 21:25:25 2010
+$OpenBSD: patch-common_platform_linux_h,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
+--- common/platform.linux.h.orig	Mon May 31 19:28:57 2010
+++ common/platform.linux.h	Tue Jun 15 16:26:32 2010
@@ -63,8 +63,15 @@
 #include <dlfcn.h>
 #include <stddef.h>
@ -16,8 +16,31 @@ $OpenBSD: patch-common_platform_linux_h,v 1.6 2010/06/06 20:10:21 espie Exp $
 +#endif
 #include <errno.h>
 
- #ifdef HAVE_UNISTD_H
-@@ -669,7 +676,7 @@ time_t GetProcessTime();
+ #include <string>
+@@ -659,7 +666,11 @@ time_t GetProcessTime();
+ 
+ #ifndef ntohll
+ 	#if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifndef __OpenBSD__
+ 		#define ntohll(x) __bswap_64(x)
+#else
+		#define ntohll(x) __swap64(x)
+#endif // __OpenBSD__
+ 	#else
+ 		#define ntohll(x) (x)
+ 	#endif
+@@ -667,14 +678,18 @@ time_t GetProcessTime();
+ 
+ #ifndef htonll
+ 	#if __BYTE_ORDER == __LITTLE_ENDIAN
+#ifndef __OpenBSD__
+ 		#define htonll(x) __bswap_64(x)
+#else
+		#define htonll(x) __swap64(x)
+#endif // __OpenBSD__
+ 	#else
+ 		#define htonll(x) (x)
+ 	#endif
 #endif
 
 #define OutputDebugString(dstr) fprintf(stderr,"%s",dstr)
--- a/mail/zarafa/zarafa/patches/patch-configure
+++ b/mail/zarafa/zarafa/patches/patch-configure
@ -1,7 +1,7 @@
-$OpenBSD: patch-configure,v 1.6 2010/01/09 14:03:25 ajacoutot Exp $
--- configure.orig	Wed Jan  6 04:28:18 2010
-+++ configure	Sat Jan  9 14:10:30 2010
-@@ -21647,12 +21647,7 @@ else
+$OpenBSD: patch-configure,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
+--- configure.orig	Mon May 31 16:37:57 2010
+++ configure	Tue Jun 29 03:42:19 2010
+@@ -21781,12 +21781,7 @@ else
   want_release=no
 fi
 
@ -14,7 +14,38 @@ $OpenBSD: patch-configure,v 1.6 2010/01/09 14:03:25 ajacoutot Exp $
 
 # Check whether --enable-tcmalloc was given.
 if test "${enable_tcmalloc+set}" = set; then
-@@ -22494,7 +22489,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
+@@ -21814,7 +21809,7 @@ else
+   with_distro=rhel
+ fi
+ 
+-if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles"; then
+if test "$with_distro" != "rhel" -a "$with_distro" != "suse" -a "$with_distro" != "sles" -a "$with_distro" != "openbsd"; then
+    { echo "$as_me:$LINENO: result: invalid distro, using rhel instead" >&5
+ echo "${ECHO_T}invalid distro, using rhel instead" >&6; }
+ else
+@@ -22154,21 +22149,6 @@ echo "$as_me: error: Cannot execute $PHP_CONFIG" >&2;}
+   PHP_LDFLAGS=`$PHP_CONFIG --ldflags`
+   PHP_EXTENSION_DIR=`$PHP_CONFIG --extension-dir`
+   PHP_VERSION=`$PHP_CONFIG --version`
+-  # watch escaping for brackets
+-  PHP_SYSCONF_DIR=`$PHP_CONFIG --configure-options | sed -e 's_.*with-config-file-scan-dir=\([^ ]\+\).*_\1_'`
+-  if test ${PHP_SYSCONF_DIR:0:1} != "/"; then
+-	# find path in existing paths
+-	if test -d "/etc/php.d"; then
+-		PHP_SYSCONF_DIR="/etc/php.d"
+-	elif test -d "/etc/php5/conf.d"; then
+-		PHP_SYSCONF_DIR="/etc/php5/conf.d"
+-	else
+-		# this happens on old distributions
+-	    { echo "$as_me:$LINENO: result: Cannot find php sysconf path, forcing /usr/share/doc/zarafa" >&5
+-echo "${ECHO_T}Cannot find php sysconf path, forcing /usr/share/doc/zarafa" >&6; }
+-		PHP_SYSCONF_DIR="/usr/share/doc/zarafa"
+-	fi
+-  fi
+ 
+   if test -z "$PHP_EXTENSION_DIR"; then
+     { { echo "$as_me:$LINENO: error: Cannot find php-config. Please use --with-php-config=PATH" >&5
+@@ -22694,7 +22674,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
 _ACEOF
 
 		VMIME_CFLAGS=-I$VMIME_PREFIX
@ -23,16 +54,19 @@ $OpenBSD: patch-configure,v 1.6 2010/01/09 14:03:25 ajacoutot Exp $
 
 else
 
-@@ -22897,7 +22892,7 @@ if test `eval echo '${'$as_ac_Header'}'` = yes; then
- #define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
- _ACEOF
-   ICAL_CFLAGS=-I$ICAL_PREFIX
-	ICAL_LIBS="-lical -licalss"
-+	ICAL_LIBS="${ZAFARA_LDFLAGS} -lical-zarafa -licalss-zarafa"
- else
-   WITH_ICAL=no
+@@ -23369,8 +23349,10 @@ else
+   WITH_CLUCENE_FALSE=
 fi
-@@ -23766,13 +23761,13 @@ LIBS=$libs_keep
+ 
+# XXX force removing clucene support
+WITH_CLUCENE_TRUE='#'
+WITH_CLUCENE_FALSE=
+ 
+-
+ CFLAGS=$cflags_keep
+ CXXFLAGS=$cxxflags_keep
+ ac_ext=c
+@@ -24399,13 +24381,13 @@ LIBS=$libs_keep
 libs_keep=$LIBS
 # check lib, but do not set in link list
 
@ -49,7 +83,7 @@ $OpenBSD: patch-configure,v 1.6 2010/01/09 14:03:25 ajacoutot Exp $
 cat >conftest.$ac_ext <<_ACEOF
 /* confdefs.h.  */
 _ACEOF
-@@ -23832,7 +23827,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
+@@ -24465,7 +24447,7 @@ if test $ac_cv_lib_pthread_pthread_create = yes; then
 #define HAVE_LIBPTHREAD 1
 _ACEOF
 
--- a/mail/zarafa/zarafa/patches/patch-doc_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-doc_Makefile_in
@ -1,15 +1,28 @@
-$OpenBSD: patch-doc_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- doc/Makefile.in.orig	Fri Oct 16 20:39:22 2009
-+++ doc/Makefile.in	Wed Oct 21 11:32:04 2009
+$OpenBSD: patch-doc_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
+--- doc/Makefile.in.orig	Mon May 31 16:38:00 2010
+++ doc/Makefile.in	Tue Jun 29 17:16:09 2010
+@@ -229,9 +229,9 @@ dist_data_DATA = 
+ BUILT_SOURCES = zarafa.1
+ allpages = \
+ 	zarafa-dagent.1 zarafa-passwd.1 zarafa-spooler.1 zarafa-admin.1 zarafa-server.1 zarafa-gateway.1 zarafa-monitor.1 zarafa-cfgchecker.1 \
+-	zarafa-backup.1	zarafa-restore.1 zarafa-ical.1 zarafa-licensed.1 zarafa-stats.1 zarafa-fsck.1 zarafa-indexer.1 zarafa-report.1 \
+-	zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-ldapms.cfg.5 zarafa-unix.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
+-	zarafa-monitor.cfg.5 zarafa-licensed.cfg.5 zarafa-dagent.cfg.5 zarafa-indexer.cfg.5
+	zarafa-backup.1	zarafa-restore.1 zarafa-ical.1 zarafa-stats.1 zarafa-fsck.1 zarafa-report.1 \
+	zarafa-ical.cfg.5 zarafa-server.cfg.5 zarafa-ldap.cfg.5 zarafa-spooler.cfg.5 zarafa-gateway.cfg.5 \
+	zarafa-monitor.cfg.5 zarafa-dagent.cfg.5
+ 
+ man_MANS = $(BUILT_SOURCES) $(allpages)
+ EXTRA_DIST = $(BUILT_SOURCES) $(allpages) manual.xml
@@ -374,12 +374,12 @@ uninstall-man5:
 	done
 install-dist_dataDATA: $(dist_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+-	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(dist_data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  f=$(am__strip_dir) \
 -	  echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
 -	  $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
 +	  echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
@ -17,7 +30,7 @@ $OpenBSD: patch-doc_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
 	done
 
 uninstall-dist_dataDATA:
-@@ -524,7 +524,7 @@ $(BUILT_SOURCES): manual.xml
+@@ -535,7 +535,7 @@ $(BUILT_SOURCES): manual.xml
 	@if [ -z $(PROG_XMLTO) ]; then \
 		echo Please install xmlto to generate manual pages; \
 	else \
--- a/mail/zarafa/zarafa/patches/patch-doc_manual_xml
+++ b/mail/zarafa/zarafa/patches/patch-doc_manual_xml
@ -1,7 +1,7 @@
-$OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
--- doc/manual.xml.orig	Wed Apr 14 09:14:40 2010
-+++ doc/manual.xml	Thu Apr 22 10:28:51 2010
-@@ -795,9 +795,7 @@
+$OpenBSD: patch-doc_manual_xml,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
+--- doc/manual.xml.orig	Mon May 31 15:44:13 2010
+++ doc/manual.xml	Mon Jun 14 09:16:43 2010
+@@ -820,9 +820,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -12,7 +12,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default:
 			  <replaceable>/var/run/zarafa-dagent.pid</replaceable>
-@@ -1164,11 +1162,6 @@
+@@ -1182,11 +1180,6 @@
 		  <replaceable>/path/to/server.cfg</replaceable>
 		</para>
 
@ -24,7 +24,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -2806,9 +2799,7 @@
+@@ -2856,9 +2849,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -35,7 +35,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default:
 			  <replaceable>/var/run/zarafa-server.pid</replaceable>
-@@ -5201,13 +5192,8 @@
+@@ -5601,13 +5592,8 @@
 		</para>
 
 		<para>The spooler process will keep running and watching the
@ -51,7 +51,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -5379,9 +5365,7 @@
+@@ -5779,9 +5765,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -62,7 +62,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default:
 			  <replaceable>/var/run/zarafa-spooler.pid</replaceable>
-@@ -5774,13 +5758,8 @@
+@@ -6167,13 +6151,8 @@
 
 		<para><command>zarafa-gateway</command></para>
 
@ -78,7 +78,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -5992,9 +5971,7 @@
+@@ -6385,9 +6364,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -89,7 +89,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default:
 			  <replaceable>/var/run/zarafa-gateway.pid</replaceable>
-@@ -6357,14 +6334,8 @@
+@@ -6743,14 +6720,8 @@
 
 		<para>The monitor checks user mailbox sizes. The monitor sends
 		a quota email when the warning quota limit is reached. When
@ -105,7 +105,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -6516,9 +6487,7 @@
+@@ -6902,9 +6873,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -116,7 +116,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default value: /var/run/zarafa-monitor.pid
 			  </para>
-@@ -7770,13 +7739,8 @@
+@@ -8157,13 +8126,8 @@
 
 		<para><command>zarafa-ical</command></para>
 
@ -132,7 +132,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -7951,9 +7915,7 @@
+@@ -8338,9 +8302,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
@ -143,7 +143,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 			  </para>
 			  <para>Default:
 			  <replaceable>/var/run/zarafa-ical.pid</replaceable>
-@@ -8274,13 +8236,8 @@
+@@ -8654,13 +8616,8 @@
 
 		<para><command>zarafa-licensed</command></para>
 
@ -159,7 +159,7 @@ $OpenBSD: patch-doc_manual_xml,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
 	  </refsection>
 
 	  <refsection>
-@@ -8424,9 +8381,7 @@
+@@ -8804,9 +8761,7 @@
 		  <varlistentry>
 			<term><option>pid_file</option></term>
 			<listitem>
--- a/mail/zarafa/zarafa/patches/patch-installer_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-installer_Makefile_in
@ -1,15 +1,24 @@
-$OpenBSD: patch-installer_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- installer/Makefile.in.orig	Fri Oct 16 20:39:23 2009
-+++ installer/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -273,12 +273,12 @@ distclean-libtool:
- uninstall-info-am:
+$OpenBSD: patch-installer_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/Makefile.in.orig	Mon May 31 16:38:00 2010
+++ installer/Makefile.in	Tue Jun 29 17:14:47 2010
+@@ -232,7 +232,7 @@ sysconfdir = @sysconfdir@
+ target_alias = @target_alias@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-SUBDIRS = linux userscripts quotamail indexerscripts
+SUBDIRS = linux userscripts quotamail
+ dist_data_DATA = ldap/zarafa.schema licenseagreement/eula.txt licenseagreement/AGPL-3
+ all: all-recursive
+ 
+@@ -274,12 +274,12 @@ clean-libtool:
+ 	-rm -rf .libs _libs
 install-dist_dataDATA: $(dist_data_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(datadir)" || $(mkdir_p) "$(DESTDIR)$(datadir)"
-+	test -z "$(docdir)" || $(mkdir_p) "$(DESTDIR)$(docdir)"
+-	test -z "$(datadir)" || $(MKDIR_P) "$(DESTDIR)$(datadir)"
+	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
 	@list='$(dist_data_DATA)'; for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f="`echo $$p | sed -e 's|^.*/||'`"; \
+ 	  f=$(am__strip_dir) \
 -	  echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(datadir)/$$f'"; \
 -	  $(dist_dataDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(datadir)/$$f"; \
 +	  echo " $(dist_dataDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
--- a/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-installer_linux_Makefile_in
@ -1,33 +1,48 @@
-$OpenBSD: patch-installer_linux_Makefile_in,v 1.9 2010/04/22 10:06:18 ajacoutot Exp $
--- installer/linux/Makefile.in.orig	Wed Apr 14 13:13:43 2010
-+++ installer/linux/Makefile.in	Thu Apr 22 11:31:44 2010
-@@ -57,23 +57,11 @@ SOURCES =
+$OpenBSD: patch-installer_linux_Makefile_in,v 1.10 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/linux/Makefile.in.orig	Mon May 31 16:38:00 2010
+++ installer/linux/Makefile.in	Tue Jun 29 20:14:03 2010
+@@ -54,15 +54,15 @@ am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGUR
+ mkinstalldirs = $(install_sh) -d
+ CONFIG_HEADER = $(top_builddir)/common/config.h
+ CONFIG_CLEAN_FILES =
+-am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconf_initdir)" \
+-	"$(DESTDIR)$(datadir)" "$(DESTDIR)$(data_configdir)" \
+am__installdirs = "$(DESTDIR)$(bindir)" \
+	"$(DESTDIR)$(datadir)" \
+ 	"$(DESTDIR)$(sysconf_certdir)" \
+ 	"$(DESTDIR)$(sysconf_configdir)" \
+ 	"$(DESTDIR)$(sysconf_rotatedir)" \
+ 	"$(DESTDIR)$(sysconf_sysconfigdir)"
+ dist_binSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+ sysconf_initSCRIPT_INSTALL = $(INSTALL_SCRIPT)
+-SCRIPTS = $(dist_bin_SCRIPTS) $(sysconf_init_SCRIPTS)
+SCRIPTS = $(dist_bin_SCRIPTS)
+ SOURCES =
 DIST_SOURCES =
- am__dist_data_DATA_DIST = server.cfg unix.cfg ldap.openldap.cfg \
- 	ldap.active-directory.cfg spooler.cfg gateway.cfg monitor.cfg \
-	dagent.cfg ical.cfg zarafa.logrotate zarafa-server.init.suse \
-	zarafa-spooler.init.suse zarafa-gateway.init.suse \
-	zarafa-monitor.init.suse zarafa-ical.init.suse \
-	zarafa-server.init.fc zarafa-spooler.init.fc \
-	zarafa-gateway.init.fc zarafa-monitor.init.fc \
-	zarafa-ical.init.fc zarafa-server.init.cbs4 \
-	zarafa-spooler.init.cbs4 zarafa-gateway.init.cbs4 \
-	zarafa-monitor.init.cbs4 zarafa-ical.init.cbs4 \
-+	dagent.cfg ical.cfg \
- 	db-convert-4.1-to-4.2 db-convert-4.20-to-4.21 \
- 	db-convert-4.20-to-innodb.sql db-calc-storesize \
- 	db-convert-attachments-to-files createuser.dotforward \
-	db-convert-4.2x-to-5.00 ssl-certificates.sh \
-	zarafa-dagent.init.cbs4 zarafa-dagent.init.suse \
-	zarafa-dagent.init.fc autorespond licensed.cfg \
-	ldapms.openldap.cfg ldapms.active-directory.cfg \
-	zarafa-licensed.init.cbs4 zarafa-licensed.init.suse \
-	zarafa-licensed.init.fc
-+	db-convert-4.2x-to-5.00 ssl-certificates.sh
+ am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+@@ -72,17 +72,17 @@ am__vpath_adj = case $$p in \
+   esac;
+ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
 dist_dataDATA_INSTALL = $(INSTALL_DATA)
- am__dist_sysconf_DATA_DIST = addtrust.crt
- dist_sysconfDATA_INSTALL = $(INSTALL_DATA)
-@@ -221,6 +209,7 @@ datadir = ${docdir}
+-am__dist_data_config_DATA_DIST = server.cfg unix.cfg ldap.propmap.cfg \
+am__dist_data_config_DATA_DIST = server.cfg ldap.propmap.cfg \
+ 	spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg \
+-	indexer.cfg autorespond licensed.cfg ldap.openldap.cfg \
+	autorespond ldap.openldap.cfg \
+ 	ldap.active-directory.cfg ldapms.openldap.cfg \
+ 	ldapms.active-directory.cfg
+ dist_data_configDATA_INSTALL = $(INSTALL_DATA)
+ am__dist_sysconf_cert_DATA_DIST = addtrust.crt
+ dist_sysconf_certDATA_INSTALL = $(INSTALL_DATA)
+-am__dist_sysconf_config_DATA_DIST = server.cfg unix.cfg \
+am__dist_sysconf_config_DATA_DIST = server.cfg \
+ 	ldap.propmap.cfg spooler.cfg gateway.cfg monitor.cfg \
+-	dagent.cfg ical.cfg indexer.cfg autorespond licensed.cfg \
+	dagent.cfg ical.cfg autorespond \
+ 	ldap.openldap.cfg ldap.active-directory.cfg \
+ 	ldapms.openldap.cfg ldapms.active-directory.cfg
+ dist_sysconf_configDATA_INSTALL = $(INSTALL_DATA)
+@@ -232,6 +232,7 @@ datadir = ${docdir}
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
@ -35,19 +50,75 @@ $OpenBSD: patch-installer_linux_Makefile_in,v 1.9 2010/04/22 10:06:18 ajacoutot
 exec_prefix = @exec_prefix@
 host = @host@
 host_alias = @host_alias@
-@@ -249,13 +238,10 @@ sharedstatedir = @sharedstatedir@
- sysconfdir = /etc/zarafa/report-ca
+@@ -260,8 +261,8 @@ sysconfdir = @sysconfdir@
 target_alias = @target_alias@
- dist_data_DATA = server.cfg unix.cfg ldap.openldap.cfg ldap.active-directory.cfg \
-	spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg zarafa.logrotate \
-	zarafa-server.init.suse zarafa-spooler.init.suse zarafa-gateway.init.suse zarafa-monitor.init.suse zarafa-ical.init.suse \
-	zarafa-server.init.fc zarafa-spooler.init.fc zarafa-gateway.init.fc zarafa-monitor.init.fc zarafa-ical.init.fc \
-	zarafa-server.init.cbs4 zarafa-spooler.init.cbs4 zarafa-gateway.init.cbs4 zarafa-monitor.init.cbs4 zarafa-ical.init.cbs4 \
-+	spooler.cfg gateway.cfg monitor.cfg dagent.cfg ical.cfg \
- 	db-convert-4.1-to-4.2 db-convert-4.20-to-4.21 db-convert-4.20-to-innodb.sql db-calc-storesize db-convert-attachments-to-files \
- 	createuser.dotforward db-convert-4.2x-to-5.00 ssl-certificates.sh \
-	zarafa-dagent.init.cbs4 zarafa-dagent.init.suse zarafa-dagent.init.fc autorespond\
-+	autorespond\
- $(am__append_1)
- dist_bin_SCRIPTS = zarafa-autorespond
- @OSS_ONLY_FALSE@dist_sysconf_DATA = addtrust.crt
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+-config_files = server.cfg unix.cfg ldap.propmap.cfg spooler.cfg \
+-	gateway.cfg monitor.cfg dagent.cfg ical.cfg indexer.cfg \
+config_files = server.cfg ldap.propmap.cfg spooler.cfg \
+	gateway.cfg monitor.cfg dagent.cfg ical.cfg \
+ 	autorespond $(am__append_2) $(BUILT_SOURCES)
+ rhel_initscript_files = zarafa-server.init.rhel \
+ 	zarafa-spooler.init.rhel zarafa-gateway.init.rhel \
+@@ -456,15 +457,7 @@ uninstall-dist_sysconf_configDATA:
+ 	  echo " rm -f '$(DESTDIR)$(sysconf_configdir)/$$f'"; \
+ 	  rm -f "$(DESTDIR)$(sysconf_configdir)/$$f"; \
+ 	done
+-install-dist_sysconf_rotateDATA: $(dist_sysconf_rotate_DATA)
+-	@$(NORMAL_INSTALL)
+-	test -z "$(sysconf_rotatedir)" || $(MKDIR_P) "$(DESTDIR)$(sysconf_rotatedir)"
+-	@list='$(dist_sysconf_rotate_DATA)'; for p in $$list; do \
+-	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+-	  f=$(am__strip_dir) \
+-	  echo " $(dist_sysconf_rotateDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(sysconf_rotatedir)/$$f'"; \
+-	  $(dist_sysconf_rotateDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(sysconf_rotatedir)/$$f"; \
+-	done
+install-dist_sysconf_rotateDATA:
+ 
+ uninstall-dist_sysconf_rotateDATA:
+ 	@$(NORMAL_UNINSTALL)
+@@ -528,7 +521,7 @@ check: $(BUILT_SOURCES)
+ 	$(MAKE) $(AM_MAKEFLAGS) check-am
+ all-am: Makefile $(SCRIPTS) $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(sysconf_initdir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(data_configdir)" "$(DESTDIR)$(sysconf_certdir)" "$(DESTDIR)$(sysconf_configdir)" "$(DESTDIR)$(sysconf_rotatedir)" "$(DESTDIR)$(sysconf_sysconfigdir)"; do \
+	for dir in "$(DESTDIR)$(bindir)" "$(DESTDIR)$(datadir)" "$(DESTDIR)$(data_configdir)" "$(DESTDIR)$(sysconf_certdir)" "$(DESTDIR)$(sysconf_configdir)" "$(DESTDIR)$(sysconf_sysconfigdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: $(BUILT_SOURCES)
+@@ -575,9 +568,9 @@ info: info-am
+ 
+ info-am:
+ 
+-install-data-am: install-dist_dataDATA install-dist_data_configDATA \
+install-data-am: install-dist_dataDATA \
+ 	install-dist_sysconf_certDATA install-dist_sysconf_configDATA \
+-	install-dist_sysconf_rotateDATA install-sysconf_initSCRIPTS \
+	install-dist_sysconf_rotateDATA \
+ 	install-sysconf_sysconfigDATA
+ 	@$(NORMAL_INSTALL)
+ 	$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+@@ -657,13 +650,7 @@ ldapms.active-directory.cfg: ldap.m4
+ 	m4 -DTYPE=ADS -DMULTISERVER=1 ${top_srcdir}/installer/linux/ldap.m4 > $@
+ 
+ install-data-hook:
+-	install -d -m 755 ${DESTDIR}/${sysconf_configdir}/license
+ 	install -d -m 755 ${DESTDIR}/${sysconf_configdir}/report
+-	mv ${DESTDIR}/${sysconf_rotatedir}/zarafa.logrotate ${DESTDIR}/${sysconf_rotatedir}/zarafa
+-	mv ${DESTDIR}/${sysconf_rotatedir}/zarafa-indexer.logrotate ${DESTDIR}/${sysconf_rotatedir}/zarafa-indexer
+-	if test -f ${DESTDIR}/${sysconf_rotatedir}/zarafa-licensed.logrotate; then \
+-		mv ${DESTDIR}/${sysconf_rotatedir}/zarafa-licensed.logrotate ${DESTDIR}/${sysconf_rotatedir}/zarafa-licensed; \
+-	fi
+ 	if test ${DISTRO} = "sles" -o ${DISTRO} = "suse"; then \
+ 		mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa || true; \
+ 		mv ${DESTDIR}${sysconf_sysconfigdir}/sysconfig-indexer.suse ${DESTDIR}${sysconf_sysconfigdir}/sysconfig.zarafa-indexer || true; \
+@@ -685,8 +672,6 @@ install-data-hook:
+ 			mv "$$f" "$$newf"; \
+ 		done \
+ 	fi
+-	install -d -m 755 ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
+-	mv ${DESTDIR}/${data_configdir}/indexer.cfg ${DESTDIR}/${datarootdir}/doc/zarafa-indexer/example-config
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
+ .NOEXPORT:
--- a/mail/zarafa/zarafa/patches/patch-installer_linux_ldap_openldap_cfg
+++ b/mail/zarafa/zarafa/patches/patch-installer_linux_ldap_openldap_cfg
@ -1,6 +1,6 @@
-$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.2 2009/10/20 22:34:26 ajacoutot Exp $
--- installer/linux/ldap.openldap.cfg.orig	Fri Oct  9 17:26:46 2009
-+++ installer/linux/ldap.openldap.cfg	Tue Oct 20 23:41:36 2009
+$OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.3 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/linux/ldap.openldap.cfg.orig	Mon May 31 16:38:25 2010
+++ installer/linux/ldap.openldap.cfg	Mon Jun 14 09:16:43 2010
@@ -29,7 +29,7 @@ ldap_server_charset = utf-8
 # Optional, default = empty (anonymous bind)
 # The userPassword attribute must be readable for this user if the
@ -10,12 +10,12 @@ $OpenBSD: patch-installer_linux_ldap_openldap_cfg,v 1.2 2009/10/20 22:34:26 ajac
 
 # LDAP bind password
 # Optional, default = empty (no password)
-@@ -154,7 +154,7 @@ ldap_nonactive_attribute =
+@@ -121,7 +121,7 @@ ldap_password_attribute = userPassword
 # Choices: bind, password
 # Active directory: bind
 # LDAP: password
 -ldap_authentication_method = password
 +ldap_authentication_method = bind
 
- # Optional, default = cn
- # Active directory: cn
+ # Optional, default = mail
+ # Active directory: mail
--- a/mail/zarafa/zarafa/patches/patch-installer_linux_server_cfg
+++ b/mail/zarafa/zarafa/patches/patch-installer_linux_server_cfg
@ -1,6 +1,6 @@
-$OpenBSD: patch-installer_linux_server_cfg,v 1.5 2009/11/12 16:44:59 ajacoutot Exp $
--- installer/linux/server.cfg.orig	Fri Oct 16 15:56:00 2009
-+++ installer/linux/server.cfg	Thu Nov 12 17:41:17 2009
+$OpenBSD: patch-installer_linux_server_cfg,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/linux/server.cfg.orig	Mon May 31 15:44:43 2010
+++ installer/linux/server.cfg	Mon Jun 14 09:16:43 2010
@@ -36,16 +36,16 @@ local_admin_users	= root
 system_email_address	= postmaster@localhost
 
@ -31,7 +31,7 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.5 2009/11/12 16:44:59 ajacoutot E
 
 ##############################################################
 # LOG SETTINGS
-@@ -89,10 +89,10 @@ mysql_password		= root
+@@ -89,10 +89,10 @@ mysql_password		= 
 mysql_database		= zarafa
 
 # Where to place attachments. Value can be 'database' or 'files'
@ -66,9 +66,9 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.5 2009/11/12 16:44:59 ajacoutot E
 -sslkeys_path		= /etc/zarafa/sslkeys
 +sslkeys_path		= ${SYSCONFDIR}/zarafa/sslkeys
 
- 
 ##############################################################
-@@ -196,23 +196,24 @@ companyquota_warn      = 0
+ # THREAD SETTINGS
+@@ -246,23 +246,24 @@ companyquota_warn      = 0
 # Name of the plugin that handles users
 # Required, default = ldap
 # Values: ldap, unix, db
@ -100,9 +100,9 @@ $OpenBSD: patch-installer_linux_server_cfg,v 1.5 2009/11/12 16:44:59 ajacoutot E
 +createcompany_script	=	${SYSCONFDIR}/zarafa/userscripts/createcompany
 +deletecompany_script	=	${SYSCONFDIR}/zarafa/userscripts/deletecompany
 
- ##############################################################
- # MISC SETTINGS
-@@ -259,7 +260,7 @@ client_update_enabled = false
+ # Set this option to 'yes' to skip the creation and deletion of new users
+ # The action will be logged, so you can see if your changes to the plugin
+@@ -319,7 +320,7 @@ client_update_enabled = false
 
 # Place the correct Zarafa Outlook Client in this directory for
 # Windows clients to download through the Zarafa server
--- a/mail/zarafa/zarafa/patches/patch-installer_linux_unix_cfg
+++ b/mail/zarafa/zarafa/patches/patch-installer_linux_unix_cfg
@ -1,8 +1,8 @@
-$OpenBSD: patch-installer_linux_unix_cfg,v 1.1.1.1 2009/02/16 09:44:37 ajacoutot Exp $
--- installer/linux/unix.cfg.orig	Sun Oct 19 19:46:32 2008
-+++ installer/linux/unix.cfg	Sun Oct 19 19:49:30 2008
-@@ -31,4 +31,4 @@ min_group_gid = 1000
- max_group_gid = 10000
+$OpenBSD: patch-installer_linux_unix_cfg,v 1.2 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/linux/unix.cfg.orig	Mon May 31 15:44:43 2010
+++ installer/linux/unix.cfg	Mon Jun 14 09:16:44 2010
+@@ -39,4 +39,4 @@ max_group_gid = 10000
+ # except_group_gids =
 
 # Create a user as non-active when it has this unix shell
 -non_login_shell = /bin/false
--- a/mail/zarafa/zarafa/patches/patch-installer_userscripts_companies_common_sh
+++ b/mail/zarafa/zarafa/patches/patch-installer_userscripts_companies_common_sh
@ -1,16 +1,16 @@
-$OpenBSD: patch-installer_userscripts_companies_common_sh,v 1.3 2009/12/16 18:39:11 ajacoutot Exp $
--- installer/userscripts/companies_common.sh.orig	Tue Dec 15 16:07:54 2009
-+++ installer/userscripts/companies_common.sh	Wed Dec 16 18:33:53 2009
+$OpenBSD: patch-installer_userscripts_companies_common_sh,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/userscripts/companies_common.sh.orig	Mon May 31 15:44:42 2010
+++ installer/userscripts/companies_common.sh	Mon Jun 14 09:23:14 2010
@@ -1,7 +1,7 @@
 # shell include script
 
- ZARAFA_LANG="--lang ${LC_MESSAGES:-en_EN}"
+ ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
 -PATH=/bin:/usr/local/bin:/usr/bin
 +PATH=$PATH:${PREFIX}/bin
+ export ZARAFA_LANG PATH
 
 if [ -z "${ZARAFA_COMPANY_SCRIPTS}" ] ; then
-     exec >&2
-@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_COMPANY}" -a -z "${ZARAFA_COMPANYID}
+@@ -22,4 +22,4 @@ if [ -z "${ZARAFA_COMPANY}" -a -z "${ZARAFA_COMPANYID}
     exit 1
 fi
 
--- a/mail/zarafa/zarafa/patches/patch-installer_userscripts_groups_common_sh
+++ b/mail/zarafa/zarafa/patches/patch-installer_userscripts_groups_common_sh
@ -1,16 +1,16 @@
-$OpenBSD: patch-installer_userscripts_groups_common_sh,v 1.3 2009/12/16 18:39:11 ajacoutot Exp $
--- installer/userscripts/groups_common.sh.orig	Tue Dec 15 16:07:54 2009
-+++ installer/userscripts/groups_common.sh	Wed Dec 16 18:33:53 2009
+$OpenBSD: patch-installer_userscripts_groups_common_sh,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/userscripts/groups_common.sh.orig	Mon May 31 15:44:42 2010
+++ installer/userscripts/groups_common.sh	Mon Jun 14 09:22:58 2010
@@ -1,7 +1,7 @@
 # shell include script
 
- ZARAFA_LANG="--lang ${LC_MESSAGES:-en_EN}"
+ ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
 -PATH=/bin:/usr/local/bin:/usr/bin
 +PATH=$PATH:${PREFIX}/bin
+ export ZARAFA_LANG PATH
 
 if [ -z "${ZARAFA_GROUP_SCRIPTS}" ] ; then
-     exec >&2
-@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_GROUP}" -a -z "${ZARAFA_GROUPID}" ] 
+@@ -22,4 +22,4 @@ if [ -z "${ZARAFA_GROUP}" -a -z "${ZARAFA_GROUPID}" ] 
     exit 1
 fi
 
--- a/mail/zarafa/zarafa/patches/patch-installer_userscripts_users_common_sh
+++ b/mail/zarafa/zarafa/patches/patch-installer_userscripts_users_common_sh
@ -1,16 +1,16 @@
-$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.3 2009/12/16 18:39:11 ajacoutot Exp $
--- installer/userscripts/users_common.sh.orig	Tue Dec 15 16:07:54 2009
-+++ installer/userscripts/users_common.sh	Wed Dec 16 18:33:53 2009
+$OpenBSD: patch-installer_userscripts_users_common_sh,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- installer/userscripts/users_common.sh.orig	Mon May 31 15:44:42 2010
+++ installer/userscripts/users_common.sh	Mon Jun 14 09:23:32 2010
@@ -1,7 +1,7 @@
 # shell include script
 
- ZARAFA_LANG="${LC_MESSAGES:-en_EN}"
+ ZARAFA_LANG="${ZARAFA_USERSCRIPT_LOCALE:-${LC_MESSAGES:-en_US}}"
 -PATH=/bin:/usr/local/bin:/usr/bin
 +PATH=$PATH:${PREFIX}/bin
+ export ZARAFA_LANG PATH
 
 if [ -z "${ZARAFA_USER_SCRIPTS}" ] ; then
-     exec >&2
-@@ -21,4 +21,4 @@ if [ -z "${ZARAFA_USER}" -a -z "${ZARAFA_STOREID}" ] ;
+@@ -22,4 +22,4 @@ if [ -z "${ZARAFA_USER}" -a -z "${ZARAFA_STOREID}" ] ;
     exit 1
 fi
 
--- a/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-libfreebusy_Makefile_in
@ -1,12 +1,12 @@
-$OpenBSD: patch-libfreebusy_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- libfreebusy/Makefile.in.orig	Fri Oct 16 20:39:24 2009
-+++ libfreebusy/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -256,7 +256,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
- 	-I${top_srcdir}/mapi4linux/include -I${top_srcdir}/provider/common \
+$OpenBSD: patch-libfreebusy_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- libfreebusy/Makefile.in.orig	Mon May 31 16:38:01 2010
+++ libfreebusy/Makefile.in	Mon Jun 14 09:19:14 2010
+@@ -252,7 +252,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX \
 	-I${top_srcdir}/common
 
+ libfreebusy_la_includedir = $(includedir)/libfreebusy
 -libfreebusy_la_LDFLAGS = -static
 +libfreebusy_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
- libfreebusy_la_SOURCES = ECEnumFBBlock.cpp ECEnumFBBlock.h	\
- 	ECFBBlockList.cpp ECFBBlockList.h						\
- 	ECFreeBusyData.cpp ECFreeBusyData.h						\
+ libfreebusy_la_include_HEADERS = ECEnumFBBlock.h ECFBBlockList.h		\
+ 	ECFreeBusyData.h ECFreeBusySupport.h ECFreeBusyUpdate.h freebusy.h	\
+ 	freebusyguid.h freebusytags.h freebusyutil.h
--- a/mail/zarafa/zarafa/patches/patch-mapi4linux_src_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-mapi4linux_src_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.4 2009/10/21 09:59:54 ajacoutot Exp $
--- mapi4linux/src/Makefile.in.orig	Fri Oct 16 20:39:25 2009
-+++ mapi4linux/src/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -254,7 +254,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
+$OpenBSD: patch-mapi4linux_src_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- mapi4linux/src/Makefile.in.orig	Mon May 31 16:38:01 2010
+++ mapi4linux/src/Makefile.in	Mon Jun 14 09:16:44 2010
+@@ -251,7 +251,7 @@ AM_LDFLAGS = $(DL_LIBS) -export-symbols ${top_srcdir}/
 libmapi_la_LIBADD = ${top_builddir}/common/libcommon_util.la
 
 # required because we're exporting extern "C" functions and want to filter with 'export-symbols'
--- a/mail/zarafa/zarafa/patches/patch-perl_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-perl_Makefile_in
@ -1,12 +0,0 @@
-$OpenBSD: patch-perl_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- perl/Makefile.in.orig	Fri Oct 16 20:39:25 2009
-+++ perl/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -538,7 +538,7 @@ uninstall-am: uninstall-info-am uninstall-libLTLIBRARI
- 
- 
- .xs.cpp: typemap
-	xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/share/perl/$(PVERSION)/ExtUtils/typemap $< > $@; \
-+	xsubpp -noprototypes -nolinenumbers -C++ -typemap /usr/libdata/perl5/ExtUtils/typemap $< > $@; \
- 	if [ $$? -ne 0 ]; then rm $@; fi
- 
- check-syntax:
--- a/mail/zarafa/zarafa/patches/patch-php-ext_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-php-ext_Makefile_in
@ -1,16 +1,16 @@
-$OpenBSD: patch-php-ext_Makefile_in,v 1.7 2009/10/21 09:59:54 ajacoutot Exp $
--- php-ext/Makefile.in.orig	Fri Oct 16 20:39:25 2009
-+++ php-ext/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -226,7 +226,7 @@ build_alias = @build_alias@
- build_cpu = @build_cpu@
+$OpenBSD: patch-php-ext_Makefile_in,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
+--- php-ext/Makefile.in.orig	Mon May 31 16:38:02 2010
+++ php-ext/Makefile.in	Tue Jun 29 18:54:36 2010
+@@ -224,7 +224,7 @@ build_cpu = @build_cpu@
 build_os = @build_os@
 build_vendor = @build_vendor@
+ builddir = @builddir@
 -datadir = ${datarootdir}/php/mapi
-+datadir = ${PREFIX-php}/include/php/mapi
+datadir = /var/www/include/php/mapi
 datarootdir = @datarootdir@
 docdir = @docdir@
 dvidir = @dvidir@
-@@ -270,7 +270,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
+@@ -271,7 +271,7 @@ mapi_la_LDFLAGS = -module -avoid-version \
 	${top_builddir}/common/libcommon_util.la \
 	${top_builddir}/libfreebusy/libfreebusy.la \
 	${top_builddir}/inetmapi/libinetmapi.la \
@ -19,3 +19,12 @@ $OpenBSD: patch-php-ext_Makefile_in,v 1.7 2009/10/21 09:59:54 ajacoutot Exp $
 
 
 # it seems linking libraries with -pthread will not contain -lpthread.
+@@ -554,7 +554,7 @@ install-data-am: install-dist_dataDATA
+ 
+ install-dvi: install-dvi-am
+ 
+-install-exec-am: install-dist_sysconfDATA install-libLTLIBRARIES
+install-exec-am: install-libLTLIBRARIES
+ 
+ install-html: install-html-am
+ 
--- a/mail/zarafa/webaccess/patches/patch-php-webclient-ajaxhtaccess
+++ b/mail/zarafa/webaccess/patches/patch-php-webclient-ajaxhtaccess
@ -1,6 +1,6 @@
-$OpenBSD: patch-php-webclient-ajax__htaccess,v 1.1.1.1 2009/02/16 09:43:39 ajacoutot Exp $
--- php-webclient-ajax/.htaccess.orig	Wed Jan  7 12:19:15 2009
-+++ php-webclient-ajax/.htaccess	Wed Jan  7 12:19:31 2009
+$OpenBSD: patch-php-webclient-ajax__htaccess,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- php-webclient-ajax/.htaccess.orig	Mon Jun 14 09:43:59 2010
+++ php-webclient-ajax/.htaccess	Mon Jun 14 09:44:11 2010
@@ -17,5 +17,5 @@ php_flag short_open_tag on
 
 # For debugging only
--- a/mail/zarafa/webaccess/patches/patch-php-webclient-ajax_config_php_dist
+++ b/mail/zarafa/webaccess/patches/patch-php-webclient-ajax_config_php_dist
@ -1,6 +1,6 @@
-$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.3 2009/12/16 18:41:25 ajacoutot Exp $
--- php-webclient-ajax/config.php.dist.orig	Tue Dec 15 16:07:04 2009
-+++ php-webclient-ajax/config.php.dist	Wed Dec 16 19:03:54 2009
+$OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- php-webclient-ajax/config.php.dist.orig	Mon May 31 15:43:05 2010
+++ php-webclient-ajax/config.php.dist	Mon Jun 14 09:45:07 2010
@@ -11,9 +11,9 @@
 	define("CONFIG_CHECK", TRUE);
 
@ -29,7 +29,7 @@ $OpenBSD: patch-php-webclient-ajax_config_php_dist,v 1.3 2009/12/16 18:41:25 aja
 
 	// Define the relative URL for dialogs, this string is appended with HTTP GET arguments
 	define("DIALOG_URL", "index.php?load=dialog&");
-@@ -114,7 +115,7 @@
+@@ -117,7 +118,7 @@
 
 	// Spellchecker, change here to enable
 	define('FCKEDITOR_SPELLCHECKER_ENABLED', false);
--- a/mail/zarafa/zarafa/patches/patch-provider_client_ECNotifyMaster_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_client_ECNotifyMaster_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.4 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/client/ECNotifyMaster.cpp.orig	Tue Jan 26 17:34:50 2010
-+++ provider/client/ECNotifyMaster.cpp	Wed Feb  3 08:53:19 2010
-@@ -371,7 +371,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
+$OpenBSD: patch-provider_client_ECNotifyMaster_cpp,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/client/ECNotifyMaster.cpp.orig	Mon May 31 19:28:58 2010
+++ provider/client/ECNotifyMaster.cpp	Mon Jun 14 09:16:44 2010
+@@ -392,7 +392,7 @@ void* ECNotifyMaster::NotifyWatch(void *pTmpNotifyMast
 		notificationArray *pNotifyArray = NULL;
 
 		hr = pNotifyMaster->m_lpTransport->HrGetNotify(&pNotifyArray);
--- a/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-provider_client_Makefile_in
@ -1,17 +1,17 @@
-$OpenBSD: patch-provider_client_Makefile_in,v 1.6 2009/10/21 09:59:54 ajacoutot Exp $
--- provider/client/Makefile.in.orig	Fri Oct 16 20:39:26 2009
-+++ provider/client/Makefile.in	Wed Oct 21 11:32:04 2009
-@@ -330,7 +330,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX				\
- 	-I${top_srcdir}/libfreebusy					\
- 	-I${top_srcdir}/common
+$OpenBSD: patch-provider_client_Makefile_in,v 1.7 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/client/Makefile.in.orig	Mon May 31 16:38:02 2010
+++ provider/client/Makefile.in	Mon Jun 14 09:16:44 2010
+@@ -288,7 +288,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX				\
+ 	-I${top_srcdir}/common						\
+ 	-I${top_srcdir}/zarafa-libsync
 
 -libzarafaclient_la_LDFLAGS = -avoid-version -export-symbols ${top_srcdir}/provider/client/client-exports.sym
 +libzarafaclient_la_LDFLAGS = -export-symbols ${top_srcdir}/provider/client/client-exports.sym
 libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)	\
 	${top_builddir}/provider/soap/libgsoap.la			\
 	${top_builddir}/provider/soap/libsoapclient.la		\
-@@ -342,7 +342,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)	
- 	${top_builddir}/mapi4linux/src/libmapi.la			\
+@@ -301,7 +301,7 @@ libzarafaclient_la_LIBADD = $(GSOAP_LIBS) $(SSL_LIBS)	
+ 	${top_builddir}/zarafa-libsync/libzarafasync.la		\
 	-lstdc++ $(UUID_LIBS)
 
 -CXXLD = --tag=none gcc
--- a/mail/zarafa/zarafa/patches/patch-provider_client_WSTransport_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_client_WSTransport_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.4 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/client/WSTransport.cpp.orig	Tue Jan 26 17:34:50 2010
-+++ provider/client/WSTransport.cpp	Wed Feb  3 08:53:19 2010
-@@ -54,6 +54,10 @@
- #include <mapitags.h>
- #include <mapiutil.h>
+$OpenBSD: patch-provider_client_WSTransport_cpp,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/client/WSTransport.cpp.orig	Mon May 31 19:28:58 2010
+++ provider/client/WSTransport.cpp	Mon Jun 14 09:16:44 2010
+@@ -56,6 +56,10 @@
+ 
+ #include <fstream>
 
 +#ifdef __OpenBSD__
 +#include <pthread.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_client_WSTransport_cpp,v 1.4 2010/03/21 11:15:20 ajacou
 #include "ECIConv.h"
 #include "WSTransport.h"
 #include "ProviderUtil.h"
-@@ -61,7 +65,6 @@
+@@ -63,7 +67,6 @@
 #include "soapH.h"
 #include "ZarafaUtil.h"
 
@ -20,7 +20,7 @@ $OpenBSD: patch-provider_client_WSTransport_cpp,v 1.4 2010/03/21 11:15:20 ajacou
 // The header files we use for communication with the server
 #include "ZarafaCode.h"
 #include "soapZarafaCmdProxy.h"
-@@ -89,6 +92,10 @@ static char THIS_FILE[] = __FILE__;
+@@ -90,6 +93,10 @@ static char THIS_FILE[] = __FILE__;
 #endif
 
 #define	pbMUIDECSABGuid	"\xac\x21\xa9\x50\x40\xd3\xee\x48\xb3\x19\xfb\xa7\x53\x30\x44\x25"
--- a/mail/zarafa/zarafa/patches/patch-provider_common_ECSearchClient_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_common_ECSearchClient_cpp
@ -0,0 +1,35 @@
+$OpenBSD: patch-provider_common_ECSearchClient_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/common/ECSearchClient.cpp.orig	Tue Jun 29 00:34:25 2010
+++ provider/common/ECSearchClient.cpp	Tue Jun 29 00:35:13 2010
+@@ -123,7 +123,9 @@ ECRESULT ECSearchClient::Query(std::string &strQuery, 
+ 	ECRESULT er = erSuccess;
+ 	ECSearchResultArray *lpResults = NULL;
+ 	std::vector<std::string> lstResponse;
+#ifndef __OpenBSD__
+ 	locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
+ 
+ 	if (!lppsResults) {
+ 		er = ZARAFA_E_INVALID_PARAMETER;
+@@ -171,7 +173,11 @@ ECRESULT ECSearchClient::Query(std::string &strQuery, 
+ 
+ 		memcpy(lpResults->__ptr[i].sEntryId.__ptr, strEntryId.c_str(), strEntryId.size());
+ 
+#ifndef __OpenBSD__
+ 		lpResults->__ptr[i].fScore = strtod_l(tmp[1].c_str(), NULL, loc);
+#else
+		lpResults->__ptr[i].fScore = strtod(tmp[1].c_str(), NULL);
+#endif
+ 		lpResults->__size++;
+ 	}
+ 
+@@ -182,7 +188,9 @@ exit:
+ 	if ((er != erSuccess) && lpResults)
+ 		FreeSearchResults(lpResults);
+ 
+#ifndef __OpenBSD__
+ 	freelocale(loc);
+#endif
+ 
+ 	return er;
+ }
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECAttachmentStorage_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECAttachmentStorage_cpp
@ -1,12 +1,12 @@
-$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.4 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/libserver/ECAttachmentStorage.cpp.orig	Fri Mar 19 16:48:50 2010
-+++ provider/libserver/ECAttachmentStorage.cpp	Sat Mar 20 14:30:33 2010
-@@ -816,7 +816,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
+$OpenBSD: patch-provider_libserver_ECAttachmentStorage_cpp,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/libserver/ECAttachmentStorage.cpp.orig	Mon May 31 19:28:59 2010
+++ provider/libserver/ECAttachmentStorage.cpp	Mon Jun 14 09:24:54 2010
+@@ -1033,7 +1033,7 @@ ECFileAttachment::ECFileAttachment(ECDatabase *lpDatab
 {
 	m_basepath = basepath;
 	if (m_basepath.empty())
 -		m_basepath = "/var/lib/zarafa";
 +		m_basepath = "/var/db/zarafa";
+ 	
+ 	m_bTransaction = false;
 }
- 
- ECFileAttachment::~ECFileAttachment()
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECDatabaseUtils_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECDatabaseUtils_cpp
@ -0,0 +1,83 @@
+$OpenBSD: patch-provider_libserver_ECDatabaseUtils_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/libserver/ECDatabaseUtils.cpp.orig	Tue Jun 29 01:34:47 2010
+++ provider/libserver/ECDatabaseUtils.cpp	Tue Jun 29 00:46:43 2010
+@@ -554,7 +554,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 	unsigned int ulLastPos;
+ 	std::string	strData;
+ 	unsigned int type = atoi(lpRow[FIELD_NR_TYPE]);
+#ifndef __OpenBSD__
+ 	locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
+ 
+ 	lpPropVal->ulPropTag = PROP_TAG(atoi(lpRow[FIELD_NR_TYPE]),atoi(lpRow[FIELD_NR_TAG]));
+ 
+@@ -581,7 +583,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 			goto exit;
+ 		}
+ 		lpPropVal->__union = SOAP_UNION_propValData_flt;
+#ifndef __OpenBSD__
+ 		lpPropVal->Value.flt = (float)strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.flt = (float)strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
+ 		break;
+ 	case PT_BOOLEAN:
+ 		if(lpRow[FIELD_NR_ULONG] == NULL) {
+@@ -597,7 +603,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 			goto exit;
+ 		}
+ 		lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
+ 		lpPropVal->Value.dbl = strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.dbl = strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
+ 		break;
+ 	case PT_CURRENCY:
+ 		if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
+@@ -615,7 +625,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 			goto exit;
+ 		}
+ 		lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
+ 		lpPropVal->Value.dbl = strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		lpPropVal->Value.dbl = strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
+ 		break;
+ 	case PT_SYSTIME:
+ 		if(lpRow[FIELD_NR_HI] == NULL || lpRow[FIELD_NR_LO] == NULL) {
+@@ -721,7 +735,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 		for(i=0; i < lpPropVal->Value.mvflt.__size; i++)
+ 		{
+ 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
+ 			lpPropVal->Value.mvflt.__ptr[i] = (float)strtod_l(strData.c_str(), NULL, loc);
+#else
+			lpPropVal->Value.mvflt.__ptr[i] = (float)strtod(strData.c_str(), NULL);
+#endif
+ 		}
+ 		break;
+ 	case PT_MV_DOUBLE:
+@@ -738,7 +756,11 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 		for(i=0; i < lpPropVal->Value.mvdbl.__size; i++)
+ 		{
+ 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
+ 			lpPropVal->Value.mvdbl.__ptr[i] = strtod_l(strData.c_str(), NULL, loc);
+#else
+			lpPropVal->Value.mvdbl.__ptr[i] = strtod(strData.c_str(), NULL);
+#endif
+ 		}
+ 		break;
+ 	case PT_MV_CURRENCY:
+@@ -821,7 +843,9 @@ ECRESULT CopyDatabasePropValToSOAPPropVal(struct soap 
+ 	}
+ 
+ exit:
+#ifndef __OpenBSD__
+ 	freelocale(loc);
+#endif
+ 	return er;
+ }
+ 
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSessionGroup_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECSessionGroup_cpp
@ -1,9 +1,9 @@
-$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.3 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/libserver/ECSessionGroup.cpp.orig	Tue Jan 26 17:34:52 2010
-+++ provider/libserver/ECSessionGroup.cpp	Wed Feb  3 08:53:19 2010
-@@ -52,6 +52,10 @@
- #include <mapidefs.h>
- #include <mapitags.h>
+$OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/libserver/ECSessionGroup.cpp.orig	Mon May 31 19:28:59 2010
+++ provider/libserver/ECSessionGroup.cpp	Mon Jun 14 09:16:44 2010
+@@ -54,6 +54,10 @@
+ 
+ #include <algorithm>
 
 +#ifdef __OpenBSD__
 +#include <pthread.h>
@ -11,8 +11,8 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.3 2010/03/21 11:15:20
 +
 #include "ECSession.h"
 #include "ECSessionGroup.h"
- #include "SOAPUtils.h"
-@@ -60,6 +64,11 @@
+ #include "ECSessionManager.h"
+@@ -63,6 +67,11 @@
 #define new DEBUG_NEW
 #undef THIS_FILE
 static char THIS_FILE[] = __FILE__;
@ -23,4 +23,4 @@ $OpenBSD: patch-provider_libserver_ECSessionGroup_cpp,v 1.3 2010/03/21 11:15:20
 +#define PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP PTHREAD_MUTEX_INITIALIZER
 #endif
 
- /*
+ class FindChangeAdvise
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ECStoreObjectTable_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ECStoreObjectTable_cpp
@ -0,0 +1,83 @@
+$OpenBSD: patch-provider_libserver_ECStoreObjectTable_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/libserver/ECStoreObjectTable.cpp.orig	Tue Jun 29 01:35:04 2010
+++ provider/libserver/ECStoreObjectTable.cpp	Tue Jun 29 01:04:14 2010
+@@ -644,7 +644,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 	unsigned int ulLastPos;
+ 	unsigned int ulColId = 0;
+ 	std::string strData;
+#ifndef __OpenBSD__
+ 	locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
+ 	
+ 	if(lpSession == NULL || lpsMapKey == NULL)
+ 	{
+@@ -696,7 +698,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 			break;
+ 		case PT_R4:
+  			lpPropVal->__union = SOAP_UNION_propValData_flt;
+#ifndef __OpenBSD__
+ 			lpPropVal->Value.flt = (float)strtod_l(lpDBRow[ulColId], NULL, loc);
+#else
+			lpPropVal->Value.flt = (float)strtod(lpDBRow[ulColId], NULL);
+#endif
+ 			break;
+ 		case PT_BOOLEAN:
+  			lpPropVal->__union = SOAP_UNION_propValData_b;
+@@ -704,7 +710,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 			break;
+ 		case PT_DOUBLE:
+  			lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
+ 			lpPropVal->Value.dbl = strtod_l(lpDBRow[ulColId], NULL, loc);
+#else
+			lpPropVal->Value.dbl = strtod(lpDBRow[ulColId], NULL);
+#endif
+ 			break;
+ 		case PT_CURRENCY:
+ 			lpPropVal->Value.hilo = s_alloc<hiloLong>(soap);
+@@ -714,7 +724,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 			break;
+ 		case PT_APPTIME:
+  			lpPropVal->__union = SOAP_UNION_propValData_dbl;
+#ifndef __OpenBSD__
+ 			lpPropVal->Value.dbl = strtod_l(lpDBRow[ulColId], NULL, loc);
+#else
+			lpPropVal->Value.dbl = strtod(lpDBRow[ulColId], NULL);
+#endif
+ 			break;
+ 		case PT_SYSTIME:
+ 			lpPropVal->Value.hilo = s_alloc<hiloLong>(soap);
+@@ -807,7 +821,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 			{
+ 				ParseMVProp(lpDBRow[ulColId], lpDBLen[ulColId], &ulLastPos, &strData);
+ 
+#ifndef __OpenBSD__
+ 				lpPropVal->Value.mvflt.__ptr[j] = (float)strtod_l(strData.c_str(), NULL, loc);
+#else
+				lpPropVal->Value.mvflt.__ptr[j] = (float)strtod(strData.c_str(), NULL);
+#endif
+ 			}
+ 			break;
+ 		case PT_MV_APPTIME:
+@@ -827,7 +845,11 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 			{
+ 				ParseMVProp(lpDBRow[ulColId], lpDBLen[ulColId], &ulLastPos, &strData);
+ 
+#ifndef __OpenBSD__
+ 				lpPropVal->Value.mvdbl.__ptr[j] = strtod_l(strData.c_str(), NULL, loc);
+#else
+				lpPropVal->Value.mvdbl.__ptr[j] = strtod(strData.c_str(), NULL);
+#endif
+ 			}
+ 			break;
+ 		case PT_MV_CURRENCY:
+@@ -935,7 +957,9 @@ ECRESULT ECStoreObjectTable::CopyDatabaseRowToSOAPProp
+ 	} 
+ 
+ exit:
+#ifndef __OpenBSD__
+ 	freelocale(loc);
+#endif
+ 	return er;
+ }
+ 
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_StreamUtil_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_StreamUtil_cpp
@ -0,0 +1,71 @@
+$OpenBSD: patch-provider_libserver_StreamUtil_cpp,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/libserver/StreamUtil.cpp.orig	Tue Jun 29 01:35:22 2010
+++ provider/libserver/StreamUtil.cpp	Tue Jun 29 01:25:44 2010
+@@ -265,7 +265,9 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 	unsigned int ulKind;
+ 	unsigned int ulNameId;
+ 	std::string strNameString;
+#ifndef __OpenBSD__
+ 	locale_t loc = createlocale(LC_NUMERIC, "C");
+#endif
+ 
+ 	short i;
+ 	unsigned int ul;
+@@ -301,7 +303,11 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 			er = ZARAFA_E_NOT_FOUND;
+ 			goto exit;
+ 		}
+#ifndef __OpenBSD__
+ 		flt = (float)strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		flt = (float)strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
+ 		er = lpSink->Write(&flt, sizeof(flt), 1);
+ 		break;
+ 	case PT_BOOLEAN:
+@@ -318,7 +324,11 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 			er = ZARAFA_E_NOT_FOUND;
+ 			goto exit;
+ 		}
+#ifndef __OpenBSD__
+ 		dbl = strtod_l(lpRow[FIELD_NR_DOUBLE], NULL, loc);
+#else
+		dbl = strtod(lpRow[FIELD_NR_DOUBLE], NULL);
+#endif
+ 		er = lpSink->Write(&dbl, sizeof(dbl), 1);
+ 		break;
+ 	case PT_CURRENCY:
+@@ -407,7 +417,11 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 		for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
+ 		{
+ 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
+ 			flt = (float)strtod_l(strData.c_str(), NULL, loc);
+#else
+			flt = (float)strtod(strData.c_str(), NULL);
+#endif
+ 			er = lpSink->Write(&flt, sizeof(flt), 1);
+ 		}
+ 		break;
+@@ -424,7 +438,11 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 		for (unsigned x = 0; er == erSuccess && x < ulCount; x++)
+ 		{
+ 			ParseMVProp(lpRow[FIELD_NR_DOUBLE], lpLen[FIELD_NR_DOUBLE], &ulLastPos, &strData);
+#ifndef __OpenBSD__
+ 			dbl = strtod_l(strData.c_str(), NULL, loc);
+#else
+			dbl = strtod(strData.c_str(), NULL);
+#endif
+ 			er = lpSink->Write(&dbl, sizeof(flt), 1);
+ 		}
+ 		break;
+@@ -534,7 +552,9 @@ ECRESULT SerializeDatabasePropVal(DB_ROW lpRow, DB_LEN
+ 	}
+ 
+ exit:
+#ifndef __OpenBSD__
+ 	freelocale(loc);
+#endif
+ 	return er;
+ }
+ 
--- a/mail/zarafa/zarafa/patches/patch-provider_libserver_ZarafaCmd_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_libserver_ZarafaCmd_cpp
@ -1,10 +1,10 @@
-$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.13 2010/03/21 11:15:20 ajacoutot Exp $
+$OpenBSD: patch-provider_libserver_ZarafaCmd_cpp,v 1.14 2010/06/30 02:46:48 ajacoutot Exp $

 OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.

--- provider/libserver/ZarafaCmd.cpp.orig	Tue Jan 26 17:34:52 2010
-+++ provider/libserver/ZarafaCmd.cpp	Wed Feb  3 08:53:19 2010
-@@ -710,11 +710,11 @@ double GetTimeOfDay();
+--- provider/libserver/ZarafaCmd.cpp.orig	Mon May 31 19:28:59 2010
+++ provider/libserver/ZarafaCmd.cpp	Mon Jun 14 09:16:44 2010
+@@ -668,11 +668,11 @@ double GetTimeOfDay();
 
 #define SOAP_ENTRY_FUNCTION_HEADER(resultvar, fname) \
     ECRESULT		er = erSuccess; \
@ -18,7 +18,7 @@ OpenBSD does not have CLOCK_THREAD_CPUTIME_ID.
     if(soap->user && ((SOAPINFO *)soap->user)->lpCallBack) { \
         ((SOAPINFO *)soap->user)->lpCallBack(pthread_self(), (std::string) "[" + PrettyIP(soap->ip) + "] " + #fname, ((SOAPINFO*)soap->user)->ulCallBackParam); \
     } \
-@@ -726,11 +726,11 @@ double GetTimeOfDay();
+@@ -683,11 +683,11 @@ double GetTimeOfDay();
 #define SOAP_ENTRY_FUNCTION_FOOTER \
 __soapentry_exit: \
     *lpResultVar = er; \
--- a/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_server_ECServer_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-provider_server_ECServer_cpp,v 1.5 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/server/ECServer.cpp.orig	Tue Jan 26 17:34:51 2010
-+++ provider/server/ECServer.cpp	Wed Feb  3 08:53:19 2010
-@@ -81,6 +81,10 @@
+$OpenBSD: patch-provider_server_ECServer_cpp,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/server/ECServer.cpp.orig	Mon May 31 19:28:59 2010
+++ provider/server/ECServer.cpp	Mon Jun 14 09:16:44 2010
+@@ -82,6 +82,10 @@
 #include <libintl.h>
 #include <map>
 
@ -12,7 +12,7 @@ $OpenBSD: patch-provider_server_ECServer_cpp,v 1.5 2010/03/21 11:15:20 ajacoutot
 #ifdef _DEBUG
 #define new DEBUG_NEW
 #undef THIS_FILE
-@@ -627,7 +631,7 @@ int running_server(char *szName, char *szConfig)
+@@ -651,7 +655,7 @@ int running_server(char *szName, char *szConfig)
 		{ "mysql_config_file",			"/etc/zarafa/my.cnf" },
 #endif
 		{ "attachment_storage",			"database" },
--- a/mail/zarafa/zarafa/patches/patch-provider_server_ECSoapServerConnection_cpp
+++ b/mail/zarafa/zarafa/patches/patch-provider_server_ECSoapServerConnection_cpp
@ -1,7 +1,7 @@
-$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.3 2010/03/21 11:15:20 ajacoutot Exp $
--- provider/server/ECSoapServerConnection.cpp.orig	Tue Jan 26 17:34:51 2010
-+++ provider/server/ECSoapServerConnection.cpp	Wed Feb  3 08:53:19 2010
-@@ -55,6 +55,10 @@
+$OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.4 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/server/ECSoapServerConnection.cpp.orig	Mon May 31 19:28:59 2010
+++ provider/server/ECSoapServerConnection.cpp	Mon Jun 14 09:16:44 2010
+@@ -58,6 +58,10 @@
 #include <sys/un.h>
 #endif
 
@ -11,4 +11,4 @@ $OpenBSD: patch-provider_server_ECSoapServerConnection_cpp,v 1.3 2010/03/21 11:1
 +
 #include "ECSoapServerConnection.h"
 #include "ECServerEntrypoint.h"
- #include "ECStatsCollector.h"
+ #include "ECClientUpdate.h"
--- a/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-provider_server_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-provider_server_Makefile_in,v 1.5 2009/10/21 09:59:54 ajacoutot Exp $
--- provider/server/Makefile.in.orig	Wed Oct 21 11:30:44 2009
-+++ provider/server/Makefile.in	Wed Oct 21 11:31:47 2009
-@@ -274,10 +274,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
+$OpenBSD: patch-provider_server_Makefile_in,v 1.6 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/server/Makefile.in.orig	Mon May 31 16:38:02 2010
+++ provider/server/Makefile.in	Mon Jun 14 09:16:44 2010
+@@ -271,10 +271,11 @@ zarafa_server_LDADD = $(UUID_LIBS) $(INTL_LIBS) $(ICON
 	${top_builddir}/provider/soap/libgsoap.la								\
 	${top_builddir}/provider/soap/libsoapserver.la							\
 	${top_builddir}/provider/common/libzarafacommon.la						\
--- a/mail/zarafa/zarafa/patches/patch-provider_soap_soapdefs_h
+++ b/mail/zarafa/zarafa/patches/patch-provider_soap_soapdefs_h
@ -0,0 +1,24 @@
+$OpenBSD: patch-provider_soap_soapdefs_h,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/soap/soapdefs.h.orig	Mon Jun 28 23:56:18 2010
+++ provider/soap/soapdefs.h	Mon Jun 28 23:58:26 2010
+@@ -2,12 +2,20 @@
+ #define SOAPDEFS_H_
+ 
+ /* we want soap to use strtod_l */
+#ifndef __OpenBSD__
+ #define WITH_C_LOCALE
+#endif
+ 
+ #include <platform.h>
+ 
+#ifdef __OpenBSD__ 
+#include <sys/types.h>
+#undef FD_SETSIZE
+#define FD_SETSIZE 1024
+#else
+ #include <bits/types.h>
+ #undef __FD_SETSIZE
+ #define __FD_SETSIZE 8192
+#endif
+ 
+ #endif // ndef SOAPDEFS_H_
--- a/mail/zarafa/zarafa/patches/patch-provider_soap_stdsoap2_h
+++ b/mail/zarafa/zarafa/patches/patch-provider_soap_stdsoap2_h
@ -1,26 +1,10 @@
-$OpenBSD: patch-provider_soap_stdsoap2_h,v 1.1.1.1 2009/02/16 09:44:37 ajacoutot Exp $
--- provider/soap/stdsoap2.h.orig	Wed Dec 24 20:17:55 2008
-+++ provider/soap/stdsoap2.h	Thu Jan  8 17:47:24 2009
-@@ -49,9 +49,15 @@ A commercial use license is available from Genivia, In
- --------------------------------------------------------------------------------
- */
- 
-+#if OPENBSD
-+#include <sys/types.h>
-+#undef FD_SETSIZE
-+#define FD_SETSIZE 1024
-+#else
- #include <bits/types.h>
- #undef __FD_SETSIZE
- #define __FD_SETSIZE 8192
-+#endif
- 
- #ifdef WITH_SOAPDEFS_H
- # include "soapdefs.h"		/* include user-defined stuff */
-@@ -372,6 +378,21 @@ A commercial use license is available from Genivia, In
- #  define HAVE_LOCALTIME_R
- #  define HAVE_WCTOMB
- #  define HAVE_MBTOWC
+$OpenBSD: patch-provider_soap_stdsoap2_h,v 1.2 2010/06/30 02:46:48 ajacoutot Exp $
+--- provider/soap/stdsoap2.h.orig	Mon May 31 19:28:55 2010
+++ provider/soap/stdsoap2.h	Mon Jun 14 09:30:11 2010
+@@ -426,6 +426,21 @@ A commercial use license is available from Genivia, In
+ #  define ULONG64 unsigned LONG64
+ #  define SOAP_LONG_FORMAT "%ld"
+ #  define SOAP_ULONG_FORMAT "%lu"
 +#elif defined(OPENBSD) || defined(__OpenBSD__)
 +#  define HAVE_STRRCHR
 +#  define HAVE_STRTOD  
@ -39,12 +23,25 @@ $OpenBSD: patch-provider_soap_stdsoap2_h,v 1.1.1.1 2009/02/16 09:44:37 ajacoutot
 # else
 /* Default asumptions on supported functions */
 #  define HAVE_STRRCHR
-@@ -543,7 +564,7 @@ extern "C" {
- # define SOAP_SOCKLEN_T socklen_t
+@@ -628,7 +643,7 @@ extern "C" {
+ # endif
 #elif defined(SOCKLEN_T)
 # define SOAP_SOCKLEN_T SOCKLEN_T
-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX)
-+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OPENBSD) || defined(__OpenBSD__)
+-#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390)
+#elif defined(__socklen_t_defined) || defined(_SOCKLEN_T) || defined(CYGWIN) || defined(FREEBSD) || defined(__FreeBSD__) || defined(__QNX__) || defined(QNX) || defined(OS390) || defined(OPENBSD) || defined(__OpenBSD__)
 # define SOAP_SOCKLEN_T socklen_t
 #elif defined(IRIX) || defined(WIN32) || defined(__APPLE__) || defined(HP_UX) || defined(SUN_OS) || defined(OPENSERVER) || defined(TRU64) || defined(VXWORKS)
 # define SOAP_SOCKLEN_T int
+@@ -646,6 +661,12 @@ extern "C" {
+ 
+ #ifndef SOAP_GAI_STRERROR
+ # define SOAP_GAI_STRERROR gai_strerror
+#endif
+
+#if OPENBSD
+#undef FD_SETSIZE
+#include <sys/types.h>
+#include <sys/select.h>
+ #endif
+ 
+ #ifndef FD_SETSIZE
--- a/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp
+++ b/mail/zarafa/zarafa/patches/patch-spooler_DAgent_cpp
@ -1,6 +1,6 @@
-$OpenBSD: patch-spooler_DAgent_cpp,v 1.7 2010/04/22 10:06:18 ajacoutot Exp $
--- spooler/DAgent.cpp.orig	Wed Apr 14 13:39:54 2010
-+++ spooler/DAgent.cpp	Thu Apr 22 10:28:51 2010
+$OpenBSD: patch-spooler_DAgent_cpp,v 1.8 2010/06/30 02:46:48 ajacoutot Exp $
+--- spooler/DAgent.cpp.orig	Mon May 31 19:28:58 2010
+++ spooler/DAgent.cpp	Mon Jun 14 09:16:44 2010
@@ -88,6 +88,10 @@
 #include <sys/mman.h>
 #include <pwd.h>
@ -12,7 +12,7 @@ $OpenBSD: patch-spooler_DAgent_cpp,v 1.7 2010/04/22 10:06:18 ajacoutot Exp $
 /*
   This is actually from sysexits.h
   but since those windows lamers don't have it ..
-@@ -2636,7 +2640,7 @@ int main(int argc, char *argv[]) {
+@@ -2639,7 +2643,7 @@ int main(int argc, char *argv[]) {
 
 	DeliveryArgs sDeliveryArgs;
 	sDeliveryArgs.strPath = "";
--- a/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-spooler_Makefile_in
@ -1,7 +1,7 @@
-$OpenBSD: patch-spooler_Makefile_in,v 1.4 2010/04/22 10:06:18 ajacoutot Exp $
--- spooler/Makefile.in.orig	Wed Apr 14 13:13:47 2010
-+++ spooler/Makefile.in	Thu Apr 22 11:26:18 2010
-@@ -279,7 +279,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
+$OpenBSD: patch-spooler_Makefile_in,v 1.5 2010/06/30 02:46:48 ajacoutot Exp $
+--- spooler/Makefile.in.orig	Mon May 31 16:38:03 2010
+++ spooler/Makefile.in	Mon Jun 14 09:16:44 2010
+@@ -271,7 +271,7 @@ zarafa_spooler_LDADD = ${top_builddir}/inetmapi/libine
 	${top_builddir}/common/libcommon_mapi.la \
 	${top_builddir}/common/libcommon_util.la \
 	${top_builddir}/common/libcommon_ssl.la \
--- a/mail/zarafa/zarafa/patches/patch-zarafa-libsync_Makefile_in
+++ b/mail/zarafa/zarafa/patches/patch-zarafa-libsync_Makefile_in
@ -0,0 +1,12 @@
+$OpenBSD: patch-zarafa-libsync_Makefile_in,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+--- zarafa-libsync/Makefile.in.orig	Wed Jun 30 02:22:58 2010
+++ zarafa-libsync/Makefile.in	Wed Jun 30 02:23:17 2010
+@@ -252,7 +252,7 @@ AM_CPPFLAGS = $(DEBUGFLAGS) -DLINUX		\
+ 	-I${top_srcdir}/common
+ 
+ libzarafasync_la_includedir = $(includedir)/libzarafasync
+-libzarafasync_la_LDFLAGS = -static
+libzarafasync_la_LDFLAGS = -version-info $(ECCLIENT_LIBRARY_VERSION)
+ libzarafasync_la_include_HEADERS = ECLibSync.h ECSync.h ECSyncLog.h	\
+ 	ECSyncUtil.h ECSyncContext.h ECOfflineABImporter.h ECSyncSettings.h
+ 
--- a/mail/zarafa/zarafa/pkg/DESCR-php
+++ b/mail/zarafa/zarafa/pkg/DESCR-php
@ -1,10 +0,0 @@
-Messaging Application Programming Interface (MAPI) is a messaging
-architecture and a Component Object Model based API for Microsoft
-Windows. MAPI allows client programs to become (e-mail)
-messaging-enabled, -aware, or -based by calling MAPI subsystem routines
-that interface with certain messaging servers. While MAPI is designed to
-be independent of the protocol, it is usually used with MAPI/RPC, the
-proprietary protocol that Microsoft Outlook uses to communicate with
-Microsoft Exchange.
-
-These functions allow you to access a MAPI compliant email server.
--- a/mail/zarafa/zarafa/pkg/DESCR-web
+++ b/mail/zarafa/zarafa/pkg/DESCR-web
@ -2,3 +2,6 @@ Zarafa provides full functionality webaccess completely in the Outlook
 "Look & Feel".  It includes access to email, calendars, contacts, tasks,
 shared folders and Public Folders.  The AJAX implementation with drag &
 drop support is used be competitive with desktop email applications.
+
+This package also include the PHP mapi module that allows accessing a
+MAPI compliant email server.
--- a/mail/zarafa/zarafa/pkg/MESSAGE-php
+++ b/mail/zarafa/zarafa/pkg/MESSAGE-php
@ -1,6 +0,0 @@
-You can enable this module by creating a symbolic
-link from ${PREFIX-php}/conf/php5.sample/${MODULE_NAME}.ini to
-${PREFIX-php}/conf/php5/${MODULE_NAME}.ini.
-
-ln -fs ${PREFIX-php}/conf/php5.sample/${MODULE_NAME}.ini \
-    ${PREFIX-php}/conf/php5/${MODULE_NAME}.ini
--- a/mail/zarafa/zarafa/pkg/MESSAGE-web
+++ b/mail/zarafa/zarafa/pkg/MESSAGE-web
@ -17,3 +17,10 @@ to
   ${INSTDIR}/debug.php
 The debugging output will then be available under:
   ${INSTDIR}/debug.txt
+
+You can enable the PHP mapi module by creating a symbolic
+link from ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini to
+${PREFIX-web}/conf/php5/${MODULE_NAME}.ini:
+
+ln -fs ${PREFIX-web}/conf/php5.sample/${MODULE_NAME}.ini \
+    ${PREFIX-web}/conf/php5/${MODULE_NAME}.ini
--- a/mail/zarafa/zarafa/pkg/PLIST-main
+++ b/mail/zarafa/zarafa/pkg/PLIST-main
@ -1,8 +1,9 @@
-@comment $OpenBSD: PLIST-main,v 1.14 2010/04/22 10:06:18 ajacoutot Exp $
+@comment $OpenBSD: PLIST-main,v 1.15 2010/06/30 02:46:48 ajacoutot Exp $
@newgroup _zarafa:627
@newuser _zarafa:627:_zarafa:daemon:Zarafa Account:/var/empty:/sbin/nologin
@bin bin/zarafa-admin
 bin/zarafa-autorespond
+@bin bin/zarafa-cfgchecker
@bin bin/zarafa-dagent
@bin bin/zarafa-fsck
@bin bin/zarafa-gateway
@ -23,6 +24,7 @@ include/icalmapi/nameids.h
 include/icalmapi/valarm.h
 include/icalmapi/vconverter.h
 include/icalmapi/vevent.h
+include/icalmapi/vfreebusy.h
 include/icalmapi/vtimezone.h
 include/icalmapi/vtodo.h
 include/inetmapi/
@ -38,6 +40,24 @@ include/inetmapi/mapiTextPart.h
 include/inetmapi/options.h
 include/inetmapi/outputStreamMAPIAdapter.h
 include/inetmapi/tnef.h
+include/libfreebusy/
+include/libfreebusy/ECEnumFBBlock.h
+include/libfreebusy/ECFBBlockList.h
+include/libfreebusy/ECFreeBusyData.h
+include/libfreebusy/ECFreeBusySupport.h
+include/libfreebusy/ECFreeBusyUpdate.h
+include/libfreebusy/freebusy.h
+include/libfreebusy/freebusyguid.h
+include/libfreebusy/freebusytags.h
+include/libfreebusy/freebusyutil.h
+include/libzarafasync/
+include/libzarafasync/ECLibSync.h
+include/libzarafasync/ECOfflineABImporter.h
+include/libzarafasync/ECSync.h
+include/libzarafasync/ECSyncContext.h
+include/libzarafasync/ECSyncLog.h
+include/libzarafasync/ECSyncSettings.h
+include/libzarafasync/ECSyncUtil.h
 include/mapi4linux/
 include/mapi4linux/edkmdb.h
 include/mapi4linux/imessage.h
@ -56,6 +76,7 @@ include/zarafa/ECChannel.h
 include/zarafa/ECConfig.h
 include/zarafa/ECDebug.h
 include/zarafa/ECDefs.h
+include/zarafa/ECFifoBuffer.h
 include/zarafa/ECGuid.h
 include/zarafa/ECIConv.h
 include/zarafa/ECKeyTable.h
@ -63,17 +84,19 @@ include/zarafa/ECLogger.h
 include/zarafa/ECMemStream.h
 include/zarafa/ECMemTable.h
 include/zarafa/ECScheduler.h
+include/zarafa/ECSerializer.h
 include/zarafa/ECTags.h
 include/zarafa/ECUnknown.h
 include/zarafa/EMSAbTag.h
+include/zarafa/IECChangeAdviseSink.h
+include/zarafa/IECChangeAdvisor.h
 include/zarafa/IECExportAddressbookChanges.h
 include/zarafa/IECExportChanges.h
 include/zarafa/IECImportAddressbookChanges.h
+include/zarafa/IECImportContentsChanges.h
 include/zarafa/IECLicense.h
 include/zarafa/IECMultiStoreTable.h
 include/zarafa/IECSecurity.h
-include/zarafa/IECServerBehavior.h
-include/zarafa/IECServerMimic.h
 include/zarafa/IECServiceAdmin.h
 include/zarafa/IECSingleInstance.h
 include/zarafa/IECSpooler.h
@ -91,6 +114,11 @@ include/zarafa/base64.h
 include/zarafa/codepage.h
 include/zarafa/edkguid.h
 include/zarafa/favoritesutil.h
+include/zarafa/mapi_array_ptr.h
+include/zarafa/mapi_memory_ptr.h
+include/zarafa/mapi_object_ptr.h
+include/zarafa/mapi_ptr.h
+include/zarafa/mapi_rowset_ptr.h
 include/zarafa/mapicontact.h
 include/zarafa/mapiext.h
 include/zarafa/mapiguidext.h
@ -120,6 +148,8 @@ lib/libmapi.la
@lib lib/libmapi.so.${LIBmapi_VERSION}
 lib/libzarafaclient.la
@lib lib/libzarafaclient.so.${LIBzarafaclient_VERSION}
+@comment lib/libzarafasync.la
+@lib lib/libzarafasync.so.${LIBzarafasync_VERSION}
 lib/pkgconfig/zarafa.pc
 lib/zarafa/
@comment lib/zarafa/dbplugin.la
@ -128,11 +158,11 @@ lib/zarafa/dbplugin.so
 lib/zarafa/ldapplugin.so
@man man/man1/zarafa-admin.1
@man man/man1/zarafa-backup.1
+@man man/man1/zarafa-cfgchecker.1
@man man/man1/zarafa-dagent.1
@man man/man1/zarafa-fsck.1
@man man/man1/zarafa-gateway.1
@man man/man1/zarafa-ical.1
-@comment @man man/man1/zarafa-licensed.1
@man man/man1/zarafa-monitor.1
@man man/man1/zarafa-passwd.1
@man man/man1/zarafa-report.1
@ -145,17 +175,12 @@ lib/zarafa/ldapplugin.so
@man man/man5/zarafa-gateway.cfg.5
@man man/man5/zarafa-ical.cfg.5
@man man/man5/zarafa-ldap.cfg.5
-@comment @man man/man5/zarafa-ldapms.cfg.5
-@comment @man man/man5/zarafa-licensed.cfg.5
@man man/man5/zarafa-monitor.cfg.5
@man man/man5/zarafa-server.cfg.5
@man man/man5/zarafa-spooler.cfg.5
-@comment @man man/man5/zarafa-unix.cfg.5
 share/doc/zarafa/
 share/doc/zarafa/AGPL-3
 share/doc/zarafa/README.OpenBSD
-share/doc/zarafa/UPGRADE.txt
-share/doc/zarafa/autorespond
 share/doc/zarafa/createuser.dotforward
 share/doc/zarafa/db-calc-storesize
 share/doc/zarafa/db-convert-4.1-to-4.2
@ -163,8 +188,9 @@ share/doc/zarafa/db-convert-4.20-to-4.21
 share/doc/zarafa/db-convert-4.20-to-innodb.sql
 share/doc/zarafa/db-convert-4.2x-to-5.00
 share/doc/zarafa/db-convert-attachments-to-files
+share/doc/zarafa/db-upgrade-objectsid-to-objectguid.pl
 share/doc/zarafa/eula.txt
-share/doc/zarafa/performance-tuning.txt
+share/doc/zarafa/ldap-switch-sendas.pl
 share/doc/zarafa/ssl-certificates.sh
 share/examples/zarafa/
@sample ${SYSCONFDIR}/zarafa/
@ -174,6 +200,7 @@ share/examples/zarafa/
@mode
@group
@sample ${SYSCONFDIR}/zarafa/sslkeys/
+share/examples/zarafa/autorespond
 share/examples/zarafa/dagent.cfg
@sample ${SYSCONFDIR}/zarafa/dagent.cfg
 share/examples/zarafa/gateway.cfg
@ -192,6 +219,7 @@ share/examples/zarafa/ldap.openldap.cfg
@sample ${SYSCONFDIR}/zarafa/ldap.cfg
@mode
@group
+share/examples/zarafa/ldap.propmap.cfg
 share/examples/zarafa/local_zarafa.m4
@mode 0444
@sample /usr/share/sendmail/feature/local_zarafa.m4
@ -212,8 +240,9 @@ share/examples/zarafa/quotamail/usersoft.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/usersoft.mail
 share/examples/zarafa/quotamail/userwarning.mail
@sample ${SYSCONFDIR}/zarafa/quotamail/userwarning.mail
-share/examples/zarafa/report-ca/
@sample ${SYSCONFDIR}/zarafa/report-ca/
+share/examples/zarafa/report/
+share/examples/zarafa/report-ca/
 share/examples/zarafa/server.cfg
@mode 640
@group _zarafa
@ -222,7 +251,6 @@ share/examples/zarafa/server.cfg
@group
 share/examples/zarafa/spooler.cfg
@sample ${SYSCONFDIR}/zarafa/spooler.cfg
-@comment share/examples/zarafa/unix.cfg
 share/examples/zarafa/userscripts/
@sample ${SYSCONFDIR}/zarafa/userscripts/
@mode 755
@ -236,6 +264,9 @@ share/examples/zarafa/userscripts/createcompany.d/00createpublic
@sample ${SYSCONFDIR}/zarafa/userscripts/createcompany.d/00createpublic
 share/examples/zarafa/userscripts/creategroup
@sample ${SYSCONFDIR}/zarafa/userscripts/creategroup
+@mode
+share/examples/zarafa/userscripts/creategroup.d/
+@mode 755
 share/examples/zarafa/userscripts/createuser
@sample ${SYSCONFDIR}/zarafa/userscripts/createuser
 share/examples/zarafa/userscripts/createuser.d/
@ -244,8 +275,14 @@ share/examples/zarafa/userscripts/createuser.d/00createstore
@sample ${SYSCONFDIR}/zarafa/userscripts/createuser.d/00createstore
 share/examples/zarafa/userscripts/deletecompany
@sample ${SYSCONFDIR}/zarafa/userscripts/deletecompany
+@mode
+share/examples/zarafa/userscripts/deletecompany.d/
+@mode 755
 share/examples/zarafa/userscripts/deletegroup
@sample ${SYSCONFDIR}/zarafa/userscripts/deletegroup
+@mode
+share/examples/zarafa/userscripts/deletegroup.d/
+@mode 755
 share/examples/zarafa/userscripts/deleteuser
@sample ${SYSCONFDIR}/zarafa/userscripts/deleteuser
 share/examples/zarafa/userscripts/deleteuser.d/
@ -260,7 +297,6 @@ share/examples/zarafa/zarafa.m4
@sample /usr/share/sendmail/mailer/zarafa.m4
@mode
 share/examples/zarafa/zarafa.schema
-share/locale/ca/LC_MESSAGES/zarafa.mo
 share/locale/da/LC_MESSAGES/zarafa.mo
 share/locale/de/LC_MESSAGES/zarafa.mo
 share/locale/es/LC_MESSAGES/zarafa.mo
--- a/mail/zarafa/zarafa/pkg/PLIST-php
+++ b/mail/zarafa/zarafa/pkg/PLIST-php
@ -1,19 +0,0 @@
-@comment $OpenBSD: PLIST-php,v 1.1.1.1 2009/02/16 09:44:38 ajacoutot Exp $
-conf/php5.sample/
-conf/php5.sample/mapi.ini
-include/
-include/php/
-include/php/mapi/
-include/php/mapi/class.freebusypublish.php
-include/php/mapi/class.meetingrequest.php
-include/php/mapi/class.recurrence.php
-include/php/mapi/mapi.util.php
-include/php/mapi/mapicode.php
-include/php/mapi/mapidefs.php
-include/php/mapi/mapiguid.php
-include/php/mapi/mapitags.php
-lib/
-lib/php/
-lib/php/modules/
-@comment lib/php/modules/mapi.la
-lib/php/modules/mapi.so
--- a/mail/zarafa/zarafa/pkg/PLIST-web
+++ b/mail/zarafa/zarafa/pkg/PLIST-web
@ -1,4 +1,26 @@
-@comment $OpenBSD: PLIST,v 1.14 2010/04/27 07:26:34 ajacoutot Exp $
+@comment $OpenBSD: PLIST-web,v 1.1 2010/06/30 02:46:48 ajacoutot Exp $
+@conflict php5-mapi-*
+@pkgpath mail/zarafa/webaccess
+@pkgpath mail/zarafa/zarafa,-php
+conf/php5.sample/
+conf/php5.sample/mapi.ini.dist
+@sample conf/php5.sample/mapi.ini
+include/
+include/php/
+include/php/mapi/
+include/php/mapi/class.freebusypublish.php
+include/php/mapi/class.meetingrequest.php
+include/php/mapi/class.recurrence.php
+include/php/mapi/mapi.util.php
+include/php/mapi/mapicode.php
+include/php/mapi/mapidefs.php
+include/php/mapi/mapiguid.php
+include/php/mapi/mapitags.php
+lib/
+lib/php/
+lib/php/modules/
+@comment lib/php/modules/mapi.la
+lib/php/modules/mapi.so
 zarafa-webaccess/
@owner www
@sample zarafa-webaccess/tmp/
@ -7,13 +29,16 @@ zarafa-webaccess/.htaccess
 zarafa-webaccess/client/
 zarafa-webaccess/client/core/
 zarafa-webaccess/client/core/constants.js
+zarafa-webaccess/client/core/contactparsingobject.js
 zarafa-webaccess/client/core/date.js
 zarafa-webaccess/client/core/dhtml.js
 zarafa-webaccess/client/core/dispatcher.js
 zarafa-webaccess/client/core/inputmanager.js
+zarafa-webaccess/client/core/json.js
 zarafa-webaccess/client/core/layoutmanager.js
 zarafa-webaccess/client/core/plugin.js
 zarafa-webaccess/client/core/pluginmanager.js
+zarafa-webaccess/client/core/restriction.js
 zarafa-webaccess/client/core/utils.js
 zarafa-webaccess/client/core/viewcontroller.js
 zarafa-webaccess/client/core/webclient.js
@ -24,11 +49,13 @@ zarafa-webaccess/client/download_attachment.php
 zarafa-webaccess/client/layout/
 zarafa-webaccess/client/layout/css/
 zarafa-webaccess/client/layout/css/addtofavorite.css
+zarafa-webaccess/client/layout/css/advancedfind.css
 zarafa-webaccess/client/layout/css/appointment.css
 zarafa-webaccess/client/layout/css/calendar-print.css
 zarafa-webaccess/client/layout/css/calendar.css
 zarafa-webaccess/client/layout/css/contact.css
 zarafa-webaccess/client/layout/css/date-picker.css
+zarafa-webaccess/client/layout/css/delegates.css
 zarafa-webaccess/client/layout/css/dialog.css
 zarafa-webaccess/client/layout/css/distlist.css
 zarafa-webaccess/client/layout/css/freebusymodule.css
@ -37,10 +64,12 @@ zarafa-webaccess/client/layout/css/login.css
 zarafa-webaccess/client/layout/css/messageoptions.css
 zarafa-webaccess/client/layout/css/occurrence.css
 zarafa-webaccess/client/layout/css/properties.css
+zarafa-webaccess/client/layout/css/recipientinputwidget.css
 zarafa-webaccess/client/layout/css/recurrence.css
 zarafa-webaccess/client/layout/css/reminder.css
 zarafa-webaccess/client/layout/css/rule.css
 zarafa-webaccess/client/layout/css/rules.css
+zarafa-webaccess/client/layout/css/searchcriteria.css
 zarafa-webaccess/client/layout/css/sendMRMailConfirmation.css
 zarafa-webaccess/client/layout/css/settings.css
 zarafa-webaccess/client/layout/css/sharedfolder.css
@ -49,6 +78,7 @@ zarafa-webaccess/client/layout/css/style.css
 zarafa-webaccess/client/layout/css/style.ie.css
 zarafa-webaccess/client/layout/css/suggestionlayer.css
 zarafa-webaccess/client/layout/css/tabbar.css
+zarafa-webaccess/client/layout/css/today.css
 zarafa-webaccess/client/layout/css/tree.css
 zarafa-webaccess/client/layout/dialogs/
 zarafa-webaccess/client/layout/dialogs/framework.item.php
@ -61,6 +91,9 @@ zarafa-webaccess/client/layout/dialogs/modal/categories.php
 zarafa-webaccess/client/layout/dialogs/modal/copyfolder.php
 zarafa-webaccess/client/layout/dialogs/modal/copymessages.php
 zarafa-webaccess/client/layout/dialogs/modal/createfolder.php
+zarafa-webaccess/client/layout/dialogs/modal/customizetoday.php
+zarafa-webaccess/client/layout/dialogs/modal/delegates.php
+zarafa-webaccess/client/layout/dialogs/modal/delegatespermission.php
 zarafa-webaccess/client/layout/dialogs/modal/deleteoccurrence.php
 zarafa-webaccess/client/layout/dialogs/modal/emailaddress.php
 zarafa-webaccess/client/layout/dialogs/modal/fieldchooser.php
@ -93,9 +126,12 @@ zarafa-webaccess/client/layout/dialogs/settings/tabs/compose.js
 zarafa-webaccess/client/layout/dialogs/settings/tabs/compose.php
 zarafa-webaccess/client/layout/dialogs/settings/tabs/preferences.js
 zarafa-webaccess/client/layout/dialogs/settings/tabs/preferences.php
+zarafa-webaccess/client/layout/dialogs/settings/tabs/shortcuts.js
+zarafa-webaccess/client/layout/dialogs/settings/tabs/shortcuts.php
 zarafa-webaccess/client/layout/dialogs/settings/tabs/vacation.js
 zarafa-webaccess/client/layout/dialogs/settings/tabs/vacation.php
 zarafa-webaccess/client/layout/dialogs/standard/
+zarafa-webaccess/client/layout/dialogs/standard/advancedfind.php
 zarafa-webaccess/client/layout/dialogs/standard/appointment.php
 zarafa-webaccess/client/layout/dialogs/standard/contact.php
 zarafa-webaccess/client/layout/dialogs/standard/createmail.php
@ -111,8 +147,6 @@ zarafa-webaccess/client/layout/dialogs/standard/task.php
 zarafa-webaccess/client/layout/dialogs/utils.php
 zarafa-webaccess/client/layout/dialogs/window.php
 zarafa-webaccess/client/layout/img/
-zarafa-webaccess/client/layout/img/_login.jpg
-@sample zarafa-webaccess/client/layout/img/login.jpg
 zarafa-webaccess/client/layout/img/addressbook.gif
 zarafa-webaccess/client/layout/img/appointment_busy.gif
 zarafa-webaccess/client/layout/img/appointment_free.gif
@ -157,6 +191,7 @@ zarafa-webaccess/client/layout/img/hour_header_4.png
 zarafa-webaccess/client/layout/img/hour_header_6.png
 zarafa-webaccess/client/layout/img/hour_header_8.png
 zarafa-webaccess/client/layout/img/icon_addsignature.gif
+zarafa-webaccess/client/layout/img/icon_advanced_find.gif
 zarafa-webaccess/client/layout/img/icon_appointment_recurring.gif
 zarafa-webaccess/client/layout/img/icon_asign_task.gif
 zarafa-webaccess/client/layout/img/icon_attachments.gif
@ -179,6 +214,7 @@ zarafa-webaccess/client/layout/img/icon_drafts.gif
 zarafa-webaccess/client/layout/img/icon_drag_multiple.gif
 zarafa-webaccess/client/layout/img/icon_drag_single.gif
 zarafa-webaccess/client/layout/img/icon_empty_trash.gif
+zarafa-webaccess/client/layout/img/icon_equipment.gif
 zarafa-webaccess/client/layout/img/icon_fieldchooser.gif
 zarafa-webaccess/client/layout/img/icon_file.gif
 zarafa-webaccess/client/layout/img/icon_flag.gif
@ -209,6 +245,7 @@ zarafa-webaccess/client/layout/img/icon_flag_status_red.gif
 zarafa-webaccess/client/layout/img/icon_flag_yellow.gif
 zarafa-webaccess/client/layout/img/icon_flag_yellow_over.gif
 zarafa-webaccess/client/layout/img/icon_folder.gif
+zarafa-webaccess/client/layout/img/icon_gab_contact.gif
 zarafa-webaccess/client/layout/img/icon_group.gif
 zarafa-webaccess/client/layout/img/icon_inbox.gif
 zarafa-webaccess/client/layout/img/icon_index.gif
@ -216,12 +253,14 @@ zarafa-webaccess/client/layout/img/icon_inline.gif
 zarafa-webaccess/client/layout/img/icon_insert.gif
 zarafa-webaccess/client/layout/img/icon_journal.gif
 zarafa-webaccess/client/layout/img/icon_junk.gif
+zarafa-webaccess/client/layout/img/icon_list.gif
 zarafa-webaccess/client/layout/img/icon_mail.gif
 zarafa-webaccess/client/layout/img/icon_mail_forwarded.gif
 zarafa-webaccess/client/layout/img/icon_mail_replied.gif
 zarafa-webaccess/client/layout/img/icon_mailfolder.gif
 zarafa-webaccess/client/layout/img/icon_meeting_accept.gif
 zarafa-webaccess/client/layout/img/icon_meeting_decline.gif
+zarafa-webaccess/client/layout/img/icon_meeting_recurring.gif
 zarafa-webaccess/client/layout/img/icon_meeting_tentative.gif
 zarafa-webaccess/client/layout/img/icon_meetingrequest.gif
 zarafa-webaccess/client/layout/img/icon_meetingrequest_accept.gif
@ -259,7 +298,7 @@ zarafa-webaccess/client/layout/img/icon_previous_period.gif
 zarafa-webaccess/client/layout/img/icon_priority_high.gif
 zarafa-webaccess/client/layout/img/icon_priority_low.gif
 zarafa-webaccess/client/layout/img/icon_private.gif
-zarafa-webaccess/client/layout/img/icon_read_receipt_button.gif
+zarafa-webaccess/client/layout/img/icon_read_receipt_button.png
 zarafa-webaccess/client/layout/img/icon_recurrence.gif
 zarafa-webaccess/client/layout/img/icon_recurring.gif
 zarafa-webaccess/client/layout/img/icon_recurring_changed.gif
@ -267,9 +306,11 @@ zarafa-webaccess/client/layout/img/icon_reload.gif
 zarafa-webaccess/client/layout/img/icon_reminder.gif
 zarafa-webaccess/client/layout/img/icon_remove.gif
 zarafa-webaccess/client/layout/img/icon_renamefolder.gif
+zarafa-webaccess/client/layout/img/icon_room.gif
 zarafa-webaccess/client/layout/img/icon_rules.gif
 zarafa-webaccess/client/layout/img/icon_save.png
 zarafa-webaccess/client/layout/img/icon_search.gif
+zarafa-webaccess/client/layout/img/icon_search_indicator.gif
 zarafa-webaccess/client/layout/img/icon_send.gif
 zarafa-webaccess/client/layout/img/icon_sent.gif
 zarafa-webaccess/client/layout/img/icon_sort_ascending.gif
@ -309,15 +350,22 @@ zarafa-webaccess/client/layout/img/label_special_date.gif
 zarafa-webaccess/client/layout/img/label_travel_required.gif
 zarafa-webaccess/client/layout/img/label_work.gif
 zarafa-webaccess/client/layout/img/loader.gif
+zarafa-webaccess/client/layout/img/login.jpg.dist
+@sample zarafa-webaccess/client/layout/img/login.jpg
 zarafa-webaccess/client/layout/img/menuarrow.gif
 zarafa-webaccess/client/layout/img/menuitem_selected.gif
 zarafa-webaccess/client/layout/img/menuitem_seperator.gif
 zarafa-webaccess/client/layout/img/move_down.gif
 zarafa-webaccess/client/layout/img/move_up.gif
+zarafa-webaccess/client/layout/img/next_appointment.gif
 zarafa-webaccess/client/layout/img/print.gif
 zarafa-webaccess/client/layout/img/quota_green.gif
 zarafa-webaccess/client/layout/img/quota_orange.gif
 zarafa-webaccess/client/layout/img/quota_red.gif
+zarafa-webaccess/client/layout/img/recipwidget_bg_recipientblock_invalid.gif
+zarafa-webaccess/client/layout/img/recipwidget_icon_recipientblock_close.gif
+zarafa-webaccess/client/layout/img/recipwidget_icon_recipientblock_downarrow.gif
+zarafa-webaccess/client/layout/img/recipwidget_icon_recipientblock_edit.gif
 zarafa-webaccess/client/layout/img/refresh_calendar.png
 zarafa-webaccess/client/layout/img/refresh_white.gif
 zarafa-webaccess/client/layout/img/reply.gif
@ -347,14 +395,18 @@ zarafa-webaccess/client/layout/img/zarafa_top_03.gif
 zarafa-webaccess/client/layout/img/zarafa_top_logo.gif
 zarafa-webaccess/client/layout/js/
 zarafa-webaccess/client/layout/js/addressbook.js
+zarafa-webaccess/client/layout/js/advancedfind.js
 zarafa-webaccess/client/layout/js/advprompt.js
 zarafa-webaccess/client/layout/js/appointment.js
 zarafa-webaccess/client/layout/js/categories.js
 zarafa-webaccess/client/layout/js/contact.js
 zarafa-webaccess/client/layout/js/createmail.js
+zarafa-webaccess/client/layout/js/customizetoday.js
 zarafa-webaccess/client/layout/js/date-picker-language.js
 zarafa-webaccess/client/layout/js/date-picker-setup.js
 zarafa-webaccess/client/layout/js/date-picker.js
+zarafa-webaccess/client/layout/js/delegates.js
+zarafa-webaccess/client/layout/js/delegatespermissions.js
 zarafa-webaccess/client/layout/js/dialog.js
 zarafa-webaccess/client/layout/js/distlist.js
 zarafa-webaccess/client/layout/js/emailaddress.js
@ -390,6 +442,7 @@ zarafa-webaccess/client/layout/themes/silver/img/folder_select_scrollback.gif
 zarafa-webaccess/client/layout/themes/silver/img/icon_next.gif
 zarafa-webaccess/client/layout/themes/silver/img/icon_previous.gif
 zarafa-webaccess/client/layout/themes/silver/img/icon_search.gif
+zarafa-webaccess/client/layout/themes/silver/img/icon_search_indicator.gif
 zarafa-webaccess/client/layout/themes/silver/img/loader.gif
 zarafa-webaccess/client/layout/themes/silver/img/menuitem_seperator.gif
 zarafa-webaccess/client/layout/themes/silver/img/seperator.gif
@ -405,10 +458,42 @@ zarafa-webaccess/client/layout/themes/silver/img/zarafa_top_02.gif
 zarafa-webaccess/client/layout/themes/silver/img/zarafa_top_03.gif
 zarafa-webaccess/client/layout/themes/silver/img/zarafa_top_logo.gif
 zarafa-webaccess/client/layout/themes/silver/theme.css
+zarafa-webaccess/client/layout/themes/white/
+zarafa-webaccess/client/layout/themes/white/img/
+zarafa-webaccess/client/layout/themes/white/img/activateddayheaderback.jpg
+zarafa-webaccess/client/layout/themes/white/img/appointment_month.jpg
+zarafa-webaccess/client/layout/themes/white/img/contactheaderback.jpg
+zarafa-webaccess/client/layout/themes/white/img/dayheaderback.jpg
+zarafa-webaccess/client/layout/themes/white/img/fill_folder_off.gif
+zarafa-webaccess/client/layout/themes/white/img/fill_folder_on.gif
+zarafa-webaccess/client/layout/themes/white/img/fill_footer.gif
+zarafa-webaccess/client/layout/themes/white/img/fill_header.gif
+zarafa-webaccess/client/layout/themes/white/img/fill_header2.gif
+zarafa-webaccess/client/layout/themes/white/img/folder_select_scroll.gif
+zarafa-webaccess/client/layout/themes/white/img/folder_select_scrollback.gif
+zarafa-webaccess/client/layout/themes/white/img/icon_next.gif
+zarafa-webaccess/client/layout/themes/white/img/icon_previous.gif
+zarafa-webaccess/client/layout/themes/white/img/icon_search.gif
+zarafa-webaccess/client/layout/themes/white/img/loader.gif
+zarafa-webaccess/client/layout/themes/white/img/menuitem_seperator.gif
+zarafa-webaccess/client/layout/themes/white/img/seperator.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_left.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_left_act.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_left_sel.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_right.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_right_act.gif
+zarafa-webaccess/client/layout/themes/white/img/tab_right_sel.gif
+zarafa-webaccess/client/layout/themes/white/img/zarafa_footer.gif
+zarafa-webaccess/client/layout/themes/white/img/zarafa_top_01.gif
+zarafa-webaccess/client/layout/themes/white/img/zarafa_top_02.gif
+zarafa-webaccess/client/layout/themes/white/img/zarafa_top_03.gif
+zarafa-webaccess/client/layout/themes/white/img/zarafa_top_logo.gif
+zarafa-webaccess/client/layout/themes/white/theme.css
 zarafa-webaccess/client/loader.php
 zarafa-webaccess/client/login.php
 zarafa-webaccess/client/modules/
 zarafa-webaccess/client/modules/addressbooklistmodule.js
+zarafa-webaccess/client/modules/advancedfindlistmodule.js
 zarafa-webaccess/client/modules/appointmentitemmodule.js
 zarafa-webaccess/client/modules/appointmentlistmodule.js
 zarafa-webaccess/client/modules/buttonsmodule.js
@ -417,6 +502,7 @@ zarafa-webaccess/client/modules/contactitemmodule.js
 zarafa-webaccess/client/modules/contactlistmodule.js
 zarafa-webaccess/client/modules/createmailitemmodule.js
 zarafa-webaccess/client/modules/datepickerlistmodule.js
+zarafa-webaccess/client/modules/delegatesmodule.js
 zarafa-webaccess/client/modules/dialogmodule.js
 zarafa-webaccess/client/modules/distlistmodule.js
 zarafa-webaccess/client/modules/foldersizemodule.js
@ -446,6 +532,11 @@ zarafa-webaccess/client/modules/stickynotelistmodule.js
 zarafa-webaccess/client/modules/suggestemailaddressmodule.js
 zarafa-webaccess/client/modules/taskitemmodule.js
 zarafa-webaccess/client/modules/tasklistmodule.js
+zarafa-webaccess/client/modules/todayappointmentlistmodule.js
+zarafa-webaccess/client/modules/todayfolderlistmodule.js
+zarafa-webaccess/client/modules/todaylistmodule.js
+zarafa-webaccess/client/modules/todaymodule.js
+zarafa-webaccess/client/modules/todaytasklistmodule.js
 zarafa-webaccess/client/modules/usergroupmodule.js
 zarafa-webaccess/client/translations.js.php
 zarafa-webaccess/client/views/
@ -462,6 +553,10 @@ zarafa-webaccess/client/views/print.calendar.weekview.js
 zarafa-webaccess/client/views/print.view.js
 zarafa-webaccess/client/views/table.compact.view.js
 zarafa-webaccess/client/views/table.view.js
+zarafa-webaccess/client/views/today.calendar.view.js
+zarafa-webaccess/client/views/today.folder.view.js
+zarafa-webaccess/client/views/today.task.view.js
+zarafa-webaccess/client/views/today.view.js
 zarafa-webaccess/client/views/view.js
 zarafa-webaccess/client/webclient.php
 zarafa-webaccess/client/widgets/
@ -576,147 +671,6 @@ zarafa-webaccess/client/widgets/fckeditor/editor/fckdebug.html
 zarafa-webaccess/client/widgets/fckeditor/editor/fckdialog.html
 zarafa-webaccess/client/widgets/fckeditor/editor/fckeditor.html
 zarafa-webaccess/client/widgets/fckeditor/editor/fckeditor.original.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/browser.css
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/browser.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmactualfolder.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmcreatefolder.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmfolders.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmresourceslist.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmresourcetype.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/frmupload.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/ButtonArrow.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/Folder.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/Folder32.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderOpened.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderOpened32.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/FolderUp.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/ai.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/avi.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/bmp.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/cs.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/default.icon.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/dll.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/doc.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/exe.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/fla.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/gif.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/htm.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/html.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/jpg.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/js.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/mdb.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/mp3.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/pdf.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/png.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/ppt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/rdp.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/swf.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/swt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/txt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/vsd.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/xls.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/xml.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/32/zip.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/ai.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/avi.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/bmp.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/cs.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/default.icon.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/dll.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/doc.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/exe.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/fla.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/gif.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/htm.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/html.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/jpg.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/js.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/mdb.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/mp3.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/pdf.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/png.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/ppt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/rdp.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/swf.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/swt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/txt.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/vsd.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/xls.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/xml.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/icons/zip.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/images/spacer.gif
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/common.js
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/browser/default/js/fckxml.js
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/basexml.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/class_upload.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/commands.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/config.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/connector.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/io.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/upload.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/asp/util.asp
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/config.ascx
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/connector.aspx
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/aspx/upload.aspx
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/ImageObject.cfc
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf5_connector.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf5_upload.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_basexml.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_commands.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_connector.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_io.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_upload.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/cf_util.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/config.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/connector.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/image.cfc
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/cfm/upload.cfm
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/config.lasso
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/connector.lasso
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/lasso/upload.lasso
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/basexml.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/commands.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/config.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/connector.cgi
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/io.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/upload.cgi
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/upload_fck.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/perl/util.pl
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/basexml.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/commands.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/config.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/connector.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/io.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/phpcompat.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/upload.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/php/util.php
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/config.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/connector.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckcommands.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckconnector.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckoutput.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/fckutil.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/htaccess.txt
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/upload.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/wsgi.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/py/zope.py
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/test.html
-zarafa-webaccess/client/widgets/fckeditor/editor/filemanager/connectors/uploadtest.html
 zarafa-webaccess/client/widgets/fckeditor/editor/images/
 zarafa-webaccess/client/widgets/fckeditor/editor/images/anchor.gif
 zarafa-webaccess/client/widgets/fckeditor/editor/images/arrow_ltr.gif
@ -901,13 +855,19 @@ zarafa-webaccess/client/widgets/menu.js
 zarafa-webaccess/client/widgets/pagination.js
 zarafa-webaccess/client/widgets/print.js
 zarafa-webaccess/client/widgets/quota.js
+zarafa-webaccess/client/widgets/recipientinput.js
+zarafa-webaccess/client/widgets/recipientinputblock.js
+zarafa-webaccess/client/widgets/searchcriteria.js
 zarafa-webaccess/client/widgets/suggestionlist.js
 zarafa-webaccess/client/widgets/tablewidget.js
+zarafa-webaccess/client/widgets/tabswidget.js
 zarafa-webaccess/client/widgets/timepicker.js
 zarafa-webaccess/client/widgets/tree.js
 zarafa-webaccess/client/widgets/widget.js
 zarafa-webaccess/config.php.dist
@sample zarafa-webaccess/config.php
+zarafa-webaccess/config.php.dist.beforesubst
+zarafa-webaccess/debug.php
 zarafa-webaccess/debug.php.disabled
@mode 644
@owner www
@ -920,6 +880,7 @@ zarafa-webaccess/index.php
 zarafa-webaccess/plugins/
 zarafa-webaccess/server/
 zarafa-webaccess/server/PEAR/
+zarafa-webaccess/server/PEAR/JSON.php
 zarafa-webaccess/server/PEAR/PEAR.php
 zarafa-webaccess/server/PEAR/XML/
 zarafa-webaccess/server/PEAR/XML/Parser/
@ -943,14 +904,11 @@ zarafa-webaccess/server/core/class.properties.php
 zarafa-webaccess/server/core/class.request.php
 zarafa-webaccess/server/core/class.settings.php
 zarafa-webaccess/server/core/class.state.php
+zarafa-webaccess/server/core/class.tablecolumns.php
 zarafa-webaccess/server/core/class.xmlbuilder.php
 zarafa-webaccess/server/core/class.xmlparser.php
 zarafa-webaccess/server/core/constants.php
 zarafa-webaccess/server/language/
-zarafa-webaccess/server/language/ca_ES.UTF-8/
-zarafa-webaccess/server/language/ca_ES.UTF-8/LC_MESSAGES/
-zarafa-webaccess/server/language/ca_ES.UTF-8/LC_MESSAGES/zarafa.po
-zarafa-webaccess/server/language/ca_ES.UTF-8/language.txt
 zarafa-webaccess/server/language/da_DK.UTF-8/
 zarafa-webaccess/server/language/da_DK.UTF-8/LC_MESSAGES/
 zarafa-webaccess/server/language/da_DK.UTF-8/LC_MESSAGES/zarafa.po
@ -975,6 +933,10 @@ zarafa-webaccess/server/language/fi_FI.UTF-8/
 zarafa-webaccess/server/language/fi_FI.UTF-8/LC_MESSAGES/
 zarafa-webaccess/server/language/fi_FI.UTF-8/LC_MESSAGES/zarafa.po
 zarafa-webaccess/server/language/fi_FI.UTF-8/language.txt
+zarafa-webaccess/server/language/fr_BE.UTF-8/
+zarafa-webaccess/server/language/fr_BE.UTF-8/LC_MESSAGES/
+zarafa-webaccess/server/language/fr_BE.UTF-8/LC_MESSAGES/zarafa.po
+zarafa-webaccess/server/language/fr_BE.UTF-8/language.txt
 zarafa-webaccess/server/language/fr_FR.UTF-8/
 zarafa-webaccess/server/language/fr_FR.UTF-8/LC_MESSAGES/
 zarafa-webaccess/server/language/fr_FR.UTF-8/LC_MESSAGES/zarafa.po
@ -983,6 +945,10 @@ zarafa-webaccess/server/language/it_IT.UTF-8/
 zarafa-webaccess/server/language/it_IT.UTF-8/LC_MESSAGES/
 zarafa-webaccess/server/language/it_IT.UTF-8/LC_MESSAGES/zarafa.po
 zarafa-webaccess/server/language/it_IT.UTF-8/language.txt
+zarafa-webaccess/server/language/nl_BE.UTF-8/
+zarafa-webaccess/server/language/nl_BE.UTF-8/LC_MESSAGES/
+zarafa-webaccess/server/language/nl_BE.UTF-8/LC_MESSAGES/zarafa.po
+zarafa-webaccess/server/language/nl_BE.UTF-8/language.txt
 zarafa-webaccess/server/language/nl_NL.UTF-8/
 zarafa-webaccess/server/language/nl_NL.UTF-8/LC_MESSAGES/
 zarafa-webaccess/server/language/nl_NL.UTF-8/LC_MESSAGES/zarafa.po
@ -1006,6 +972,7 @@ zarafa-webaccess/server/language/sv_SE.UTF-8/language.txt
 zarafa-webaccess/server/mimetypes.dat
 zarafa-webaccess/server/modules/
 zarafa-webaccess/server/modules/class.addressbooklistmodule.php
+zarafa-webaccess/server/modules/class.advancedfindlistmodule.php
 zarafa-webaccess/server/modules/class.appointmentitemmodule.php
 zarafa-webaccess/server/modules/class.appointmentlistmodule.php
 zarafa-webaccess/server/modules/class.buttonsmodule.php
@ -1014,6 +981,7 @@ zarafa-webaccess/server/modules/class.contactitemmodule.php
 zarafa-webaccess/server/modules/class.contactlistmodule.php
 zarafa-webaccess/server/modules/class.createmailitemmodule.php
 zarafa-webaccess/server/modules/class.datepickerlistmodule.php
+zarafa-webaccess/server/modules/class.delegatesmodule.php
 zarafa-webaccess/server/modules/class.dialogmodule.php
 zarafa-webaccess/server/modules/class.distlistmodule.php
 zarafa-webaccess/server/modules/class.foldersizemodule.php
@ -1026,6 +994,8 @@ zarafa-webaccess/server/modules/class.listmodule.php
 zarafa-webaccess/server/modules/class.maillistmodule.php
 zarafa-webaccess/server/modules/class.mailoptionsitemmodule.php
 zarafa-webaccess/server/modules/class.module.php
+zarafa-webaccess/server/modules/class.multiusercalendarappointmentlistmodule.php
+zarafa-webaccess/server/modules/class.multiusercalendarmodule.php
 zarafa-webaccess/server/modules/class.notificationmodule.php
 zarafa-webaccess/server/modules/class.previewreadmailitemmodule.php
 zarafa-webaccess/server/modules/class.printitemmodule.php
@ -1042,6 +1012,9 @@ zarafa-webaccess/server/modules/class.stickynotelistmodule.php
 zarafa-webaccess/server/modules/class.suggestemailaddressmodule.php
 zarafa-webaccess/server/modules/class.taskitemmodule.php
 zarafa-webaccess/server/modules/class.tasklistmodule.php
+zarafa-webaccess/server/modules/class.todayappointmentlistmodule.php
+zarafa-webaccess/server/modules/class.todayfolderlistmodule.php
+zarafa-webaccess/server/modules/class.todaytasklistmodule.php
 zarafa-webaccess/server/modules/class.usergroupmodule.php
 zarafa-webaccess/server/upload_attachment.php
 zarafa-webaccess/server/util.php
--- a/mail/zarafa/zarafa/pkg/UNMESSAGE-php
+++ b/mail/zarafa/zarafa/pkg/UNMESSAGE-php
@ -1,5 +0,0 @@
-You can disable this module by removing the
-${PREFIX-php}/conf/php5/${MODULE_NAME}.ini symbolic link by
-issuing the following command: 
-
-rm -f ${PREFIX-php}/conf/php5/${MODULE_NAME}.ini
--- a/mail/zarafa/zarafa/pkg/UNMESSAGE-web
+++ b/mail/zarafa/zarafa/pkg/UNMESSAGE-web
@ -0,0 +1,5 @@
+You can disable the PHP mapi module by removing the
+${PREFIX-web}/conf/php5/${MODULE_NAME}.ini symbolic link by
+issuing the following command: 
+
+rm -f ${PREFIX-web}/conf/php5/${MODULE_NAME}.ini