Update SOGo to 2.0.4b.

2.0.4b (2013-02-04)
------------------

Bug fixes
 - Fixed order of precedence for options (#2166)
   The following order is enforced - first match wins
     1. Command line arguments
     2. .GNUstepDefaults
     3. /etc/sogo/{debconf,sogo}.conf
     4. SOGoDefaults.plist
 - fixed handling of LDAP DN containing special characters (#2152, #2207)
 - fixed handling of credential files for older GNUsteps (#2216)
 - fixed display of messages with control characters (#2079, #2177)
 - fixed tooltips in contacts list (#2211)
 - fixed classification menu in component editor (#2223)
 - fixed link to ACL editor for 'any authenticated user' (#2222, #2224)
 - fixed saving preferences when mail module is disabled
 - fixed handling for long credential strings (#2212)

2.0.4a (2013-01-30)
------------------

Enhancements
 - updated Czech translation
 - birthday is now properly formatted in addressbook module

Bug fixes
 - fixed handling of groups with spaces in their UID
 - fixed possible infinite loop in repeatable object
 - fixed until date in component editor
 - fixed saving all-day event in appointment editor
 - fixed handling of decoding contacts UID
 - fixed support of GNUstep 1.20 / Debian Squeeze

2.0.4 (2013-01-25)
------------------

New features
 - sogo-tool: new "dump-defaults" command to easily create /etc/sogo/sogo.conf

Enhancements
 - The sogo user is now a system user.
   For new installs, this means that 'su - sogo' won't work anymore.
   Please use 'sudo -u sogo cmd' instead
   If used in scripts from cronjobs, 'requiretty' must be disabled in sudoers
 - added basic support for LDAP URL in user sources
 - renamed default SOGoForceIMAPLoginWithEmail to
   SOGoForceExternalLoginWithEmail and extended it to SMTP authentication
 - updated the timezone files to the 2012j edition and removed RRDATES
 - updated CKEditor to version 4.0.1
 - added Finnish translation - thanks to Kari Salmu
 - updated translations
 - recurrence-id of all-day events is now set as a proper date with no time
 - 'show completed tasks' is now persistent
 - fixed memory usage consumption for remote ICS subscriptions

Bug fixes
 - fixed usage of browser's language for the login page
 - fixed partstat of attendee in her/his calendar
 - fixed French templates encoding
 - fixed CardDAV collections for OS X
 - fixed event recurrence editor (until date)
 - fixed column display for subfolders of draft & sent
 - improved IE7 support
 - fixed drag'n'drop of events with Safari
 - fixed first day of the week in datepickers
 - fixed exceptions of recurring all-day events

2.0.3 (2012-12-06)
------------------

New features
 - support for SAML2 for single sign-on, with the help of the lasso library
 - added support for the "AUTHENTICATE" command and SASL mechanisms
 - added domain default SieveHostFieldName
 - added a search field for tasks

Enhancements
 - search the contacts for the organization attribute
 - in HTML mode, optionally place answer after the quoted text
 - improved memory usage of "sogo-tool restore"
 - fixed invitations status in OSX iCal.app/Calendar.app (cleanup RSVP attribute)
 - now uses "imap4flags" instead of the deprecated "imapflags"
 - added Slovak translation - thanks to Martin Pastor
 - updated translations

Bug fixes
 - fixed LDIF import with categories
 - imported events now keep their UID when possible
 - fixed importation of multiple calendars
 - fixed modification date when drag'n'droping events
 - fixed missing 'from' header in Outlook
 - fixed invitations in Outlook
 - fixed JavaScript regexp for Firefox
 - fixed JavaScript syntax for IE7
 - fixed all-day event display in day/week view
 - fixed parsing of alarm
 - fixed Sieve server URL fallback
 - fixed Debian cronjob (spool directory cleanup)

5 files changed, 77 insertions, 308 deletions

diff --git a/www/SOGo/Makefile b/www/SOGo/Makefile
index d013e2dc9d5..e266b95c0d6 100644
--- a/www/SOGo/Makefile
+++ b/www/SOGo/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2013/02/06 23:23:56 jperkin Exp $
+# $NetBSD: Makefile,v 1.12 2013/03/16 15:12:57 taca Exp $
 #
 
-DISTNAME=	SOGo-2.0.2a
-PKGREVISION=	3
+DISTNAME=	SOGo-2.0.4b
 CATEGORIES=	www
 MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
 
@@ -19,12 +18,14 @@ CONFIGURE_ARGS= --enable-debug --disable-strip
 
 SOGOUSER?=	sogo
 SOGOGROUP?=	sogo
-SOGOETCDIR?=	${PKG_SYSCONFDIR}/sogo
+SOGOETCDIR?=	${PKG_SYSCONFDIR}
 SOGORUNDIR?=	${VARBASE}/sogo
+
 INSTALLATION_DIRS+=	share/examples/SOGo
-CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/sogo-conf.sh \
+
+CONF_FILES+=	share/examples/SOGo/sogo-conf.sh \
 		${PKG_SYSCONFDIR}/sogo-conf.sh
-CONF_FILES+=	${DESTDIR}${PREFIX}/share/examples/SOGo/SOGo.conf \
+CONF_FILES+=	share/examples/SOGo/SOGo.conf \
 		${PKG_SYSCONFDIR}/SOGo.conf
 OWN_DIRS+=	${SOGOETCDIR}
 OWN_DIRS+=	${SOGORUNDIR}
@@ -38,6 +39,8 @@ PKG_HOME.${SOGOUSER}=	${SOGOETCDIR}
 PKG_SHELL.${SOGOUSER}=	${SH}
 PKG_GECOS.${SOGOUSER}=	SOGo daemon user
 
+PKG_SYSCONFSUBDIR=	sogo
+
 FILES_SUBST+=	SOGORUNDIR=${SOGORUNDIR}
 FILES_SUBST+=	SOGOETCDIR=${SOGOETCDIR}
 FILES_SUBST+=	SOGOUSER=${SOGOUSER}
diff --git a/www/SOGo/PLIST b/www/SOGo/PLIST
index 7127cfd5e47..b066732845b 100644
--- a/www/SOGo/PLIST
+++ b/www/SOGo/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2012/11/24 14:06:43 manu Exp $
+@comment $NetBSD: PLIST,v 1.4 2013/03/16 15:12:57 taca Exp $
 include/GDLContentStore/EOAdaptorChannel+GCS.h
 include/GDLContentStore/GCSAlarmsFolder.h
 include/GDLContentStore/GCSChannelManager.h
@@ -109,7 +109,7 @@ lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/Info-gnustep.plist
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/Resources/SOGoDefaults.plist
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/SOGo
 lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so
-lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.2.0.2
+lib/GNUstep/Frameworks/SOGo.framework/Versions/2/libSOGo.so.${PKGVERSION}
 lib/GNUstep/Frameworks/SOGo.framework/Versions/Current
 lib/GNUstep/Frameworks/SOGo.framework/libSOGo.so
 lib/GNUstep/Libraries/Resources/NGCards/TimeZones/Africa/Abidjan.ics
@@ -543,6 +543,7 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -552,6 +553,7 @@ lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianBokmal.lproj/Localizab
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -567,6 +569,7 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -579,6 +582,7 @@ lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianBokmal.lproj/Localizable.s
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -593,6 +597,7 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -603,6 +608,7 @@ lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strin
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -618,6 +624,7 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -628,6 +635,7 @@ lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianBokmal.lproj/Localizable.strin
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -642,6 +650,7 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -653,6 +662,7 @@ lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.st
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SOGoContactFolder.toolbar
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -668,6 +678,7 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -678,6 +689,7 @@ lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianBokmal.lproj/Localizabl
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -776,6 +788,7 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -789,6 +802,7 @@ lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoDraftObject.toolbar
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailFolder.toolbar
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SOGoMailObject.toolbar
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -810,6 +824,8 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/English.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Finnish.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/French.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/German.lproj/Locale
@@ -833,6 +849,8 @@ lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Russian.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile-oracle.sql
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SOGoProfile.sql
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/SpanishSpain.lproj/Locale
@@ -852,6 +870,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -862,6 +881,7 @@ lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianBokmal.lproj/Localizable.
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/NorwegianNynorsk.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Polish.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Russian.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -876,6 +896,7 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Czech.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Danish.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Dutch.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/English.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Finnish.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/French.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/German.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Hungarian.lproj/Localizable.strings
@@ -894,6 +915,7 @@ lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoAppointmentObjectDecline.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoComponentClose.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoEmpty.toolbar
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SOGoTaskObject.toolbar
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Slovak.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishArgentina.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/SpanishSpain.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Swedish.lproj/Localizable.strings
@@ -915,7 +937,6 @@ lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactEditor.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactFoldersView.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactView.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsFilterPanel.wox
-lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsListView.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsMailerSelection.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsUserFolders.wox
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxContactsUserRightsEditor.wox
@@ -968,6 +989,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLDutchRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLEnglishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLEnglishModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLEnglishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLFinnishAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLFinnishModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLFinnishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLFrenchAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLFrenchModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLFrenchRemovalAdvisory.wox
@@ -995,6 +1019,9 @@ lib/GNUstep/SOGo/Templates/SOGoACLPolishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLRussianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSlovakAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSlovakModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLSlovakRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLSpanishArgentinaRemovalAdvisory.wox
@@ -1019,6 +1046,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderDutchAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderDutchRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderEnglishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderEnglishRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderFinnishAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderFinnishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderFrenchAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderFrenchRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderGermanAdditionAdvisory.wox
@@ -1037,6 +1066,8 @@ lib/GNUstep/SOGo/Templates/SOGoFolderPolishAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderPolishRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderRussianAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderRussianRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSlovakAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderSlovakRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderSpanishArgentinaRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderSpanishSpainAdditionAdvisory.wox
@@ -1186,315 +1217,67 @@ lib/GNUstep/SOGo/WebServerResources/busy.gif
 lib/GNUstep/SOGo/WebServerResources/calendar-folder-16x16.png
 lib/GNUstep/SOGo/WebServerResources/calendar-reload.png
 lib/GNUstep/SOGo/WebServerResources/choose-date.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/LICENSE.html
-lib/GNUstep/SOGo/WebServerResources/ckeditor/adapters/jquery.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/LICENSE.md
+lib/GNUstep/SOGo/WebServerResources/ckeditor/build-config.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/ckeditor_basic.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/config.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/contents.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/images/spacer.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/_languages.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/_translationstatus.txt
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/af.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ar.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bg.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/bs.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ca.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/cs.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/cy.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/da.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/de.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/el.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-au.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-ca.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en-gb.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/en.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/eo.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/es.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/et.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/eu.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fa.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fo.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fr-ca.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/fr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/gl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/gu.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/he.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/hu.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/id.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/is.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/it.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ja.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ka.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/km.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ko.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lt.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/lv.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/mn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ms.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nb.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/nl.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/no.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt-br.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/pt.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ro.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ru.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sr-latn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sr.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/sv.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/th.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/tr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/ug.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/uk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/vi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh-cn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/lang/zh.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/dialogs/a11yhelp.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/_translationstatus.txt
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cs.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/cy.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/da.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/de.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/el.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/en.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/eo.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fa.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/fr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/gu.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/he.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/it.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/mk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nb.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/nl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/no.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/pt-br.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ro.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/tr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/ug.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/vi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/a11yhelp/lang/zh-cn.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/about.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/about/dialogs/logo_ckeditor.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/ajax/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/autogrow/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/bbcode/plugin.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/clipboard/dialogs/paste.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/colordialog/dialogs/colordialog.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/dialog/dialogDefinition.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/div/dialogs/div.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/docprops/dialogs/docprops.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/docprops/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/find/dialogs/find.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/flash/dialogs/flash.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/flash/images/placeholder.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/button.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/checkbox.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/form.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/hiddenfield.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/radio.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/select.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/textarea.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/dialogs/textfield.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/forms/images/hiddenfield.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframe/dialogs/iframe.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframe/images/placeholder.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/iframedialog/plugin.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/fakeobjects/images/spacer.gif
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/icons.png
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/dialogs/image.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/image/images/noimage.png
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/anchor.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/dialogs/link.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/anchor.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/liststyle/dialogs/liststyle.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pagebreak/images/pagebreak.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastefromword/filter/default.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/pastetext/dialogs/pastetext.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/dialogs/placeholder.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/_translationstatus.txt
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/bg.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cs.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/cy.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/da.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/de.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/el.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/en.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/eo.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/et.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fa.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/fr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/he.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/hr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/it.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nb.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/nl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/no.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/pt-br.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/tr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/ug.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/uk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/vi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/lang/zh-cn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/placeholder.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/placeholder/plugin.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/link/images/anchor.png
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/options.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/scayt/dialogs/toolbar.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_address.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_blockquote.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_div.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h1.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h2.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h3.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h4.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h5.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_h6.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_p.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/showblocks/images/block_pre.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/dialogs/smiley.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/angel_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/angry_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/broken_heart.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/confused_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/cry_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/devil_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/embaressed_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/envelope.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/heart.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/kiss.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/lightbulb.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/omg_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/regular_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/sad_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/shades_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/teeth_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/thumbs_down.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/thumbs_up.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/tounge_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/whatchutalkingabout_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/smiley/images/wink_smile.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/dialogs/specialchar.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/_translationstatus.txt
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cs.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/cy.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/de.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/el.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/en.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/eo.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/et.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fa.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/fr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/he.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/hr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/it.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nb.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/nl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/no.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/pt-br.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/tr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/ug.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/specialchar/lang/zh-cn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/styles/styles/default.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/stylesheetparser/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/table/dialogs/table.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tableresize/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/tabletools/dialogs/tableCell.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/dialogs/templates.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/default.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template1.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template2.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/templates/templates/images/template3.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/dialogs/uicolor.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/_translationstatus.txt
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/bg.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cs.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/cy.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/da.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/de.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/el.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/en.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/eo.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/et.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fa.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/fr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/he.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/hr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/it.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/mk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nb.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/nl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/no.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pl.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/pt-br.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/tr.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/ug.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/uk.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/vi.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/lang/zh-cn.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/uicolor.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/hue_bg.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/hue_thumb.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/picker_mask.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/picker_thumb.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/assets/yui.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/uicolor/yui/yui.js
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/ciframe.html
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/tmpFrameset.html
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.css
 lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/wsc/dialogs/wsc.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/plugins/xml/plugin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/dialog.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/editor.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/icons.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/icons_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/dialog_sides_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/mini.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/noimage.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/sprites.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/sprites_ie6.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/images/toolbar_start.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/skin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/kama/templates.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/dialog.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/editor.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/icons.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/icons_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/dialog_sides_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/mini.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/noimage.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/sprites.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/images/sprites_ie6.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/skin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/office2003/templates.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/dialog.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/editor.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/icons.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/icons_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/dialog_sides_rtl.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/mini.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/noimage.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/sprites.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/sprites_ie6.png
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/images/toolbar_start.gif
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/skin.js
-lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/v2/templates.css
-lib/GNUstep/SOGo/WebServerResources/ckeditor/themes/default/theme.js
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie7.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_ie8.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_iequirks.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/dialog_opera.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_gecko.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie7.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_ie8.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/editor_iequirks.css
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/icons.png
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/arrow.png
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/close.png
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/images/mini.png
+lib/GNUstep/SOGo/WebServerResources/ckeditor/skins/moono/readme.md
+lib/GNUstep/SOGo/WebServerResources/ckeditor/styles.js
 lib/GNUstep/SOGo/WebServerResources/confidential.png
 lib/GNUstep/SOGo/WebServerResources/create-account.png
 lib/GNUstep/SOGo/WebServerResources/datepicker.css
@@ -1802,7 +1585,7 @@ lib/libNGCards.so.4.9.0
 lib/libOGoContentStore.so
 lib/libOGoContentStore.so.0.9.0
 lib/libSOGo.so
-lib/libSOGo.so.2.0.2
+lib/libSOGo.so.${PKGVERSION}
 lib/libSOGoUI.so
 lib/libSOGoUI.so.2.0.0
 sbin/sogo-ealarms-notify
diff --git a/www/SOGo/distinfo b/www/SOGo/distinfo
index 6a3a5430d80..7bbc4509a99 100644
--- a/www/SOGo/distinfo
+++ b/www/SOGo/distinfo
@@ -1,7 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/11/24 14:06:44 manu Exp $
+$NetBSD: distinfo,v 1.7 2013/03/16 15:12:57 taca Exp $
 
-SHA1 (SOGo-2.0.2a.tar.gz) = 0e722b8530465463560c2c9a2c45f748979d8674
-RMD160 (SOGo-2.0.2a.tar.gz) = dd1fc7764e9aa151ed8a64307d75d8130f05a810
-Size (SOGo-2.0.2a.tar.gz) = 6700117 bytes
-SHA1 (patch-SoObjects_SOGo_GNUmakefile.preamble) = ae129e2a04ab2e43d58c29c2db0a950881305fb1
-SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 259be0979fbbc61194a0fbccd34d81dee3659186
+SHA1 (SOGo-2.0.4b.tar.gz) = 37c03286d713c45db12ecfd3e765123350625f96
+RMD160 (SOGo-2.0.4b.tar.gz) = 7728f65b62532b460a00b4608780cf7680b6c305
+Size (SOGo-2.0.4b.tar.gz) = 6276765 bytes
+SHA1 (patch-SoObjects_SOGo_NSData+Crypto.m) = 1ea9270c9f17af383d1306d726c0e6c6733ad45a
diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble b/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble
deleted file mode 100644
index 7216b71f14d..00000000000
--- a/www/SOGo/patches/patch-SoObjects_SOGo_GNUmakefile.preamble
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-SoObjects_SOGo_GNUmakefile.preamble,v 1.1 2012/11/24 14:06:44 manu Exp $
---- ./SoObjects/SOGo/GNUmakefile.preamble.orig	2012-11-23 16:15:38.000000000 +0100
-+++ ./SoObjects/SOGo/GNUmakefile.preamble	2012-11-23 16:15:43.000000000 +0100
-@@ -23,9 +23,9 @@
- 	-lNGMime		\
- 	-lNGStreams -lNGExtensions -lEOControl \
- 	-lDOM -lSaxObjC \
- 	-lNGLdap -lSBJson \
--        -lGDLContentStore -lgnustep-base -lobjc -ldl
-+        -lGDLContentStore -lgnustep-base -lobjc 
- 
- ifeq ($(HAS_LIBRARY_gnutls),yes)
- ADDITIONAL_CPPFLAGS += -DHAVE_GNUTLS=1
- SOGo_LIBRARIES_DEPEND_UPON += -lgnutls
diff --git a/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m
index 1a27fb6536a..d46fcf11e6a 100644
--- a/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m
+++ b/www/SOGo/patches/patch-SoObjects_SOGo_NSData+Crypto.m
@@ -1,9 +1,8 @@
-$NetBSD: patch-SoObjects_SOGo_NSData+Crypto.m,v 1.1 2012/11/24 14:06:44 manu Exp $
+$NetBSD: patch-SoObjects_SOGo_NSData+Crypto.m,v 1.2 2013/03/16 15:12:57 taca Exp $
 
---- SoObjects/SOGo/NSData+Crypto.m.orig	2012-11-22 18:43:09.000000000 +0100
-+++ SoObjects/SOGo/NSData+Crypto.m	2012-11-22 18:43:47.000000000 +0100
-@@ -22,9 +22,9 @@
-  * the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+--- SoObjects/SOGo/NSData+Crypto.m.orig	2013-02-04 20:13:13.000000000 +0000
++++ SoObjects/SOGo/NSData+Crypto.m
+@@ -23,7 +23,7 @@
   * Boston, MA 02111-1307, USA.
   */
  
@@ -12,4 +11,3 @@ $NetBSD: patch-SoObjects_SOGo_NSData+Crypto.m,v 1.1 2012/11/24 14:06:44 manu Exp
  #include <crypt.h>
  #endif
  
- #include <sys/types.h>