git: a21f2b3c7a05 - main - www/sogo: update to 5.6.0

From: Jose Alonso Cardenas Marquez <acm_at_FreeBSD.org>
Date: Thu, 19 May 2022 23:32:16 UTC
The branch main has been updated by acm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a21f2b3c7a0561e682d608944fb5f98791f211e2

commit a21f2b3c7a0561e682d608944fb5f98791f211e2
Author:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
AuthorDate: 2022-05-19 23:31:13 +0000
Commit:     Jose Alonso Cardenas Marquez <acm@FreeBSD.org>
CommitDate: 2022-05-19 23:31:13 +0000

    www/sogo: update to 5.6.0
    
    ChangeLog at:   https://github.com/inverse-inc/sogo/commits/SOGo-5.6.0
---
 devel/sope/Makefile          | 3 +--
 devel/sope/distinfo          | 6 +++---
 www/sogo-activesync/Makefile | 2 +-
 www/sogo/Makefile            | 3 +--
 www/sogo/distinfo            | 6 +++---
 www/sogo/pkg-plist           | 5 +++--
 6 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/devel/sope/Makefile b/devel/sope/Makefile
index ec518c415195..908a1694330b 100644
--- a/devel/sope/Makefile
+++ b/devel/sope/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=		sope
-PORTVERSION=		5.5.1
-PORTREVISION=	2
+PORTVERSION=		5.6.0
 CATEGORIES=		devel gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOPE-${PORTVERSION}
diff --git a/devel/sope/distinfo b/devel/sope/distinfo
index 1dbbb0730559..1f434a2266a8 100644
--- a/devel/sope/distinfo
+++ b/devel/sope/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644447752
-SHA256 (SOPE-5.5.1.tar.gz) = 2515075e41f0c9eb2bcc9ba222c4cf16b89eb9c36b4372718508c8e89984f9a1
-SIZE (SOPE-5.5.1.tar.gz) = 2297429
+TIMESTAMP = 1651943058
+SHA256 (SOPE-5.6.0.tar.gz) = 24f28f164e4e1cb367542feb8bd0731cf8d71589f3ce69c9eaf9e8df0ff4dc64
+SIZE (SOPE-5.6.0.tar.gz) = 2298471
diff --git a/www/sogo-activesync/Makefile b/www/sogo-activesync/Makefile
index 8552b71ddd2a..a893a8329d1e 100644
--- a/www/sogo-activesync/Makefile
+++ b/www/sogo-activesync/Makefile
@@ -1,6 +1,6 @@
 PKGNAMESUFFIX=		-activesync
 
-CONFLICTS=		sogo[2-4] sogo[2-4]-activesync
+CONFLICTS=		sogo2 sogo2-activesync sogo
 
 OPTIONS_SLAVE=		ACTIVESYNC MFA
 
diff --git a/www/sogo/Makefile b/www/sogo/Makefile
index 560b019029a9..e63216ff8b4e 100644
--- a/www/sogo/Makefile
+++ b/www/sogo/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=		sogo
-PORTVERSION=		5.5.1
+PORTVERSION=		5.6.0
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
@@ -34,7 +34,6 @@ MFA_LIB_DEPENDS=	liboath.so:security/oath-toolkit
 SAML2_LIB_DEPENDS=	liblasso.so:security/lasso
 
 MFA_CONFIGURE_ON=	--enable-mfa
-MFA_CONFIGURE_OFF=	--disable-mfa
 SAML2_CONFIGURE_ON=	--enable-saml2
 
 USERS=			sogod
diff --git a/www/sogo/distinfo b/www/sogo/distinfo
index f3b6c634d7c7..72dab240553a 100644
--- a/www/sogo/distinfo
+++ b/www/sogo/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644447770
-SHA256 (SOGo-5.5.1.tar.gz) = acde56d070c301f35d4893ec1824a18527bf00f0220ec14cd7cc5c9475b5e830
-SIZE (SOGo-5.5.1.tar.gz) = 34561087
+TIMESTAMP = 1651943340
+SHA256 (SOGo-5.6.0.tar.gz) = 4fdfb5a80f5de077ea6b7307a490b2bf763b40d1503cbde01edb1f682545ff7b
+SIZE (SOGo-5.6.0.tar.gz) = 34580120
diff --git a/www/sogo/pkg-plist b/www/sogo/pkg-plist
index 2a05584bd970..1c79570908fc 100644
--- a/www/sogo/pkg-plist
+++ b/www/sogo/pkg-plist
@@ -676,6 +676,7 @@ GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Guadalcanal.
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Guam.ics
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Honolulu.ics
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Johnston.ics
+GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Kanton.ics
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Kiritimati.ics
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Kosrae.ics
 GNUstep/Local/Library/Libraries/Resources/NGCards/TimeZones/Pacific/Kwajalein.ics
@@ -737,8 +738,8 @@ GNUstep/Local/Library/Libraries/sogo/libSOGo.so
 GNUstep/Local/Library/Libraries/sogo/libSOGo.so.5
 GNUstep/Local/Library/Libraries/sogo/libSOGo.so.%%VERSION%%
 GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.5
-GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.5.0
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.5.6
+GNUstep/Local/Library/Libraries/sogo/libSOGoUI.so.%%VERSION%%
 GNUstep/Local/Library/OCSTypeModels/appointment-oracle.ocs
 GNUstep/Local/Library/OCSTypeModels/appointment.ocs
 GNUstep/Local/Library/OCSTypeModels/contact-oracle.ocs