Index: Makefile
===================================================================
RCS file: /cvs/ports/www/sogo/Makefile,v
retrieving revision 1.74
diff -u -r1.74 Makefile
--- Makefile	11 Jan 2018 19:27:12 -0000	1.74
+++ Makefile	8 Mar 2018 09:46:46 -0000
@@ -2,15 +2,15 @@
 
 COMMENT = 	web based groupware server
 
-VERSION =	3.2.10
+VERSION =	4.0.0
 DISTNAME =	SOGo-${VERSION}
 PKGNAME =	sogo-${VERSION}
 REVISION =	1
 
 SHARED_LIBS +=	GDLContentStore 3.0
-SHARED_LIBS +=	NGCards		3.0
-SHARED_LIBS +=	SOGo		4.1
-SHARED_LIBS +=	SOGoUI		2.1
+SHARED_LIBS +=	NGCards		3.1
+SHARED_LIBS +=	SOGo		5.0
+SHARED_LIBS +=	SOGoUI		2.2
 
 CATEGORIES =	www
 HOMEPAGE =	http://www.sogo.nu/
@@ -72,8 +72,14 @@
 		${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0.sh \
 		${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+		${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0.sh \
+		${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
+	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/sql-update-2.2.17_to_2.3.0-mysql.sh \
 		${PREFIX}/share/doc/sogo/sql-update-2.2.17_to_2.3.0-mysql.sh
+	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
+		${WRKSRC}/Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh \
+		${PREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
 	${INSTALL_SCRIPT} -c -o ${SHAREOWN} -g ${SHAREGRP} \
 		${WRKSRC}/Scripts/sql-update-3.0.0-to-combined.sh \
 		${PREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh
Index: distinfo
===================================================================
RCS file: /cvs/ports/www/sogo/distinfo,v
retrieving revision 1.40
diff -u -r1.40 distinfo
--- distinfo	7 Jul 2017 10:41:05 -0000	1.40
+++ distinfo	8 Mar 2018 09:46:46 -0000
@@ -1,2 +1,2 @@
-SHA256 (SOGo-3.2.10.tar.gz) = Y4KKk9FcMMhKeVXUSWI3PUKGl3cOh1zlqaU2c3jK8E4=
-SIZE (SOGo-3.2.10.tar.gz) = 32644083
+SHA256 (SOGo-4.0.0.tar.gz) = t/P8diJZ9j8Fs9n8/j7KUSbcChGDE1/Xwp3ezV3Z4lw=
+SIZE (SOGo-4.0.0.tar.gz) = 34458610
Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0-mysql_sh	8 Mar 2018 09:46:46 -0000
@@ -0,0 +1,68 @@
+$OpenBSD$
+
+Index: Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
+--- Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh.orig
++++ Scripts/sql-update-3.2.10_to_4.0.0-mysql.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ set -e
+ 
+@@ -12,16 +12,24 @@ set -e
+ defaultusername=$USER
+ defaulthostname=127.0.0.1
+ defaultdatabase=sogo
+-indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f /etc/sogo/sogo.conf ];then
++  indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++else
++  indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++fi
+ if [ -z "$indextable" ]; then
+   echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
+   exit 1
+ fi
+-storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f /etc/sogo/sogo.conf ];then
++  storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++else
++  storeurl=$(sogo-tool dump-defaults | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++fi
+ 
+-read -p "Username ($defaultusername): " username
+-read -p "Hostname ($defaulthostname): " hostname
+-read -p "Database ($defaultdatabase): " database
++read username?"Username ($defaultusername): "
++read hostname?"Hostname ($defaulthostname): "
++read database?"Database ($defaultdatabase): "
+ 
+ if [ -z "$username" ]
+ then
+@@ -40,7 +48,7 @@ fi
+ 
+ sqlscript=""
+ 
+-function growUserProfile() {
++growUserProfile() {
+     oldIFS="$IFS"
+     IFS=" "
+     part="`echo -e \"ALTER TABLE sogo_user_profile MODIFY c_defaults LONGTEXT;\\n\"`";
+@@ -50,7 +58,7 @@ function growUserProfile() {
+     IFS="$oldIFS"
+ }
+ 
+-function growMailInContactsQuick() {
++growMailInContactsQuick() {
+     oldIFS="$IFS"
+     IFS=" "
+     part="`echo -e \"ALTER TABLE $table MODIFY c_mail text;\\n\"`";
+@@ -58,7 +66,7 @@ function growMailInContactsQuick() {
+     IFS="$oldIFS"
+ }
+ 
+-function addCertificateInContactsQuick() {
++addCertificateInContactsQuick() {
+     oldIFS="$IFS"
+     IFS=" "
+     part="`echo -e \"ALTER TABLE $table ADD c_hascertificate INT4 DEFAULT 0;\\n\"`";
Index: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
===================================================================
RCS file: patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
diff -N patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ patches/patch-Scripts_sql-update-3_2_10_to_4_0_0_sh	8 Mar 2018 09:46:46 -0000
@@ -0,0 +1,59 @@
+$OpenBSD$
+
+Index: Scripts/sql-update-3.2.10_to_4.0.0.sh
+--- Scripts/sql-update-3.2.10_to_4.0.0.sh.orig
++++ Scripts/sql-update-3.2.10_to_4.0.0.sh
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ 
+ set -e
+ 
+@@ -10,16 +10,24 @@ set -e
+ defaultusername=$USER
+ defaulthostname=localhost
+ defaultdatabase=sogo
+-indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f /etc/sogo/sogo.conf ];then
++  indextable=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++else
++  indextable=$(sogo-tool dump-defaults | awk -F\" '/ OCSFolderInfoURL =/  {print $2}' |  awk -F/ '{print $NF}')
++fi
+ if [ -z "$indextable" ]; then
+   echo "Couldn't fetch OCSFolderInfoURL value, aborting" >&2
+   exit 1
+ fi
+-storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++if [ -f /etc/sogo/sogo.conf ];then
++  storeurl=$(sogo-tool dump-defaults -f /etc/sogo/sogo.conf | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++else
++  storeurl=$(sogo-tool dump-defaults | awk -F\" '/ OCSStoreURL =/  {print $2}' |  awk -F/ '{print $NF}')
++fi
+ 
+-read -p "Username ($defaultusername): " username
+-read -p "Hostname ($defaulthostname): " hostname
+-read -p "Database ($defaultdatabase): " database
++read username?"Username ($defaultusername): "
++read hostname?"Hostname ($defaulthostname): "
++read database?"Database ($defaultdatabase): "
+ 
+ if [ -z "$username" ]
+ then
+@@ -36,7 +44,7 @@ fi
+ 
+ sqlscript=""
+ 
+-function growMailInContactsQuick() {
++growMailInContactsQuick() {
+     oldIFS="$IFS"
+     IFS=" "
+     part="`echo -e \"ALTER TABLE $table ALTER COLUMN c_mail TYPE TEXT;\\n\"`";
+@@ -44,7 +52,7 @@ function growMailInContactsQuick() {
+     IFS="$oldIFS"
+ }
+ 
+-function addCertificateInContactsQuick() {
++addCertificateInContactsQuick() {
+     oldIFS="$IFS"
+     IFS=" "
+     part="`echo -e \"ALTER TABLE $table ADD c_hascertificate INT4 DEFAULT 0;\\n\"`";
Index: patches/patch-Tests_Unit_GNUmakefile
===================================================================
RCS file: /cvs/ports/www/sogo/patches/patch-Tests_Unit_GNUmakefile,v
retrieving revision 1.6
diff -u -r1.6 patch-Tests_Unit_GNUmakefile
--- patches/patch-Tests_Unit_GNUmakefile	15 Jun 2016 14:03:20 -0000	1.6
+++ patches/patch-Tests_Unit_GNUmakefile	8 Mar 2018 09:46:46 -0000
@@ -1,8 +1,9 @@
 $OpenBSD: patch-Tests_Unit_GNUmakefile,v 1.6 2016/06/15 14:03:20 sebastia Exp $
 Do not hardcode libobjc library name, ask GNUstep what to use.
---- Tests/Unit/GNUmakefile.orig	Fri Jun 10 16:03:21 2016
-+++ Tests/Unit/GNUmakefile	Wed Jun 15 15:47:00 2016
-@@ -43,8 +43,8 @@ $(TEST_TOOL)_CPPFLAGS += \
+Index: Tests/Unit/GNUmakefile
+--- Tests/Unit/GNUmakefile.orig
++++ Tests/Unit/GNUmakefile
+@@ -41,8 +41,8 @@ $(TEST_TOOL)_CPPFLAGS += \
  	-Wall -D_GNU_SOURCE -I../../SOPE/ -I../../SoObjects/ -I../../UI/ -I../../OpenChange
  
  ADDITIONAL_LIB_DIRS += \
Index: patches/patch-UI_MailPartViewers_GNUmakefile
===================================================================
RCS file: /cvs/ports/www/sogo/patches/patch-UI_MailPartViewers_GNUmakefile,v
retrieving revision 1.2
diff -u -r1.2 patch-UI_MailPartViewers_GNUmakefile
--- patches/patch-UI_MailPartViewers_GNUmakefile	3 Jan 2014 18:39:51 -0000	1.2
+++ patches/patch-UI_MailPartViewers_GNUmakefile	8 Mar 2018 09:46:46 -0000
@@ -2,9 +2,10 @@
 
 prevent unknown symbols on startup errors
 
---- UI/MailPartViewers/GNUmakefile.orig	Wed Dec  4 17:53:43 2013
-+++ UI/MailPartViewers/GNUmakefile	Sun Dec 15 12:47:14 2013
-@@ -25,7 +25,25 @@ MailPartViewers_OBJC_FILES += \
+Index: UI/MailPartViewers/GNUmakefile
+--- UI/MailPartViewers/GNUmakefile.orig
++++ UI/MailPartViewers/GNUmakefile
+@@ -26,7 +26,25 @@ MailPartViewers_OBJC_FILES += \
  	UIxMailPartMessageViewer.m	\
  	UIxMailPartICalViewer.m		\
  	\
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/PLIST,v
retrieving revision 1.36
diff -u -r1.36 PLIST
--- pkg/PLIST	7 Jul 2017 10:41:05 -0000	1.36
+++ pkg/PLIST	8 Mar 2018 09:46:46 -0000
@@ -610,6 +610,8 @@
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/AdministrationUI.SOGo/Resources/Croatian.lproj/
@@ -685,6 +687,8 @@
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/Appointments.SOGo/Resources/Croatian.lproj/
@@ -764,6 +768,8 @@
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/CommonUI.SOGo/Resources/Croatian.lproj/
@@ -839,6 +845,8 @@
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/Contacts.SOGo/Resources/Croatian.lproj/
@@ -913,6 +921,8 @@
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/ContactsUI.SOGo/Resources/Croatian.lproj/
@@ -989,6 +999,8 @@
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailPartViewers.SOGo/Resources/Croatian.lproj/
@@ -1063,6 +1075,8 @@
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/Croatian.lproj/
@@ -1124,6 +1138,12 @@
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailCatalanReply.wo/SOGoMailCatalanReply.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaForward.wo/SOGoMailChineseChinaForward.wod
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.html
+lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseChinaReply.wo/SOGoMailChineseChinaReply.wod
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.html
 lib/GNUstep/SOGo/Mailer.SOGo/Resources/SOGoMailChineseTaiwanForward.wo/SOGoMailChineseTaiwanForward.wod
@@ -1336,6 +1356,8 @@
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/MailerUI.SOGo/Resources/Croatian.lproj/
@@ -1418,6 +1440,9 @@
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/Locale
+lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/Locale
 lib/GNUstep/SOGo/MainUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
@@ -1532,6 +1557,8 @@
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/PreferencesUI.SOGo/Resources/Croatian.lproj/
@@ -1606,6 +1633,8 @@
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/BrazilianPortuguese.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Catalan.lproj/Localizable.strings
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseChina.lproj/
+lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseChina.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseTaiwan.lproj/
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/ChineseTaiwan.lproj/Localizable.strings
 lib/GNUstep/SOGo/SchedulerUI.SOGo/Resources/Croatian.lproj/
@@ -1705,6 +1734,7 @@
 lib/GNUstep/SOGo/Templates/ContactsUI/UIxListView.wox
 lib/GNUstep/SOGo/Templates/MailPartViewers/
 lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartAlternativeViewer.wox
+lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartEncryptedViewer.wox
 lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartExternalHTMLViewer.wox
 lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartHTMLViewer.wox
 lib/GNUstep/SOGo/Templates/MailPartViewers/UIxMailPartICalViewer.wox
@@ -1754,6 +1784,9 @@
 lib/GNUstep/SOGo/Templates/SOGoACLCatalanAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLCatalanModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLCatalanRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaModificationAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoACLChineseChinaRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanModificationAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoACLChineseTaiwanRemovalAdvisory.wox
@@ -1849,6 +1882,8 @@
 lib/GNUstep/SOGo/Templates/SOGoFolderBrazilianPortugueseRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCatalanAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCatalanRemovalAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderChineseChinaAdditionAdvisory.wox
+lib/GNUstep/SOGo/Templates/SOGoFolderChineseChinaRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderChineseTaiwanAdditionAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderChineseTaiwanRemovalAdvisory.wox
 lib/GNUstep/SOGo/Templates/SOGoFolderCroatianAdditionAdvisory.wox
@@ -2069,6 +2104,8 @@
 lib/GNUstep/SOGo/WebServerResources/fonts/MaterialIcons-Regular.woff2
 lib/GNUstep/SOGo/WebServerResources/img/
 lib/GNUstep/SOGo/WebServerResources/img/cardboard-transp.png
+lib/GNUstep/SOGo/WebServerResources/img/certificate-off.svg
+lib/GNUstep/SOGo/WebServerResources/img/certificate.svg
 lib/GNUstep/SOGo/WebServerResources/img/felt-transp.png
 lib/GNUstep/SOGo/WebServerResources/img/ic_person_grey_24px.svg
 lib/GNUstep/SOGo/WebServerResources/img/inverse.png
@@ -2107,6 +2144,7 @@
 lib/GNUstep/SOGo/WebServerResources/js/Common/navController.js
 lib/GNUstep/SOGo/WebServerResources/js/Common/range.filter.js
 lib/GNUstep/SOGo/WebServerResources/js/Common/sgAvatarImage.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Common/sgBlockToggle.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Common/sgCheckmark.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Common/sgColorPicker.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Common/sgCompile.directive.js
@@ -2196,12 +2234,15 @@
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarDayBlock.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarDayTable.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarGhost.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarListEvent.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarListItem.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarMonthDay.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarMonthEvent.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCalendarScrollView.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgCategoryStylesheet.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgDraggableCalendarBlock.directive.js
 lib/GNUstep/SOGo/WebServerResources/js/Scheduler/sgNowLine.directive.js
+lib/GNUstep/SOGo/WebServerResources/js/theme.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/
 lib/GNUstep/SOGo/WebServerResources/js/vendor/FileSaver.min.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/FileSaver.min.js.map
@@ -2252,11 +2293,13 @@
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/eu.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/fi.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/fr.js
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/he.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/hr.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/hu.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/is.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/it.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/lt.js
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/lv.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/mk.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/nb.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/lang/nl.js
@@ -2287,6 +2330,7 @@
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/base64image/dialogs/base64image.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/colordialog.css
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/colordialog/dialogs/colordialog.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/dialog/
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/dialog/dialogDefinition.js
@@ -2314,6 +2358,7 @@
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/LICENSE.md
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/
+lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/dialog.css
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/options.js
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/scayt/dialogs/toolbar.css
 lib/GNUstep/SOGo/WebServerResources/js/vendor/ckeditor/plugins/table/
@@ -2399,6 +2444,8 @@
 share/doc/sogo/sql-update-2.2.17_to_2.3.0-postgres.sh
 share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh
 share/doc/sogo/sql-update-3.0.0-to-combined.sh
+share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh
+share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh
 share/doc/sogo/updates.php
 @mode 750
 @owner _sogo
Index: pkg/README
===================================================================
RCS file: /cvs/ports/www/sogo/pkg/README,v
retrieving revision 1.21
diff -u -r1.21 README
--- pkg/README	5 Jul 2017 21:11:50 -0000	1.21
+++ pkg/README	8 Mar 2018 09:46:46 -0000
@@ -286,3 +286,14 @@
 
 # su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined.sh"
 # su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.0.0-to-combined-mysql.sh"
+
+Upgrade SOGo from < 4.0.0
+=========================
+Updating SOGo from version 3.X to 4.X requires an update of the database schema.
+
+Run one of the following scripts as the SOGo system user _sogo. Depending on
+the database you use, choose the postgres or mysql variant. The scripts
+will ask you for the database credentials.
+
+# su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-postgres.sh"
+# su _sogo "${TRUEPREFIX}/bin/bash ${TRUEPREFIX}/share/doc/sogo/sql-update-3.2.10_to_4.0.0-mysql.sh"