devel/SOPE5: update to 5.5.0

Version upgrade from upstream. Including build fixes with fragile (gcc)
flag, building without OpenLDAP option and new upstream master sites.

Changelog:
5.5.0
* fix(imap): improve debugging of EOQualifier
* fix(core): improve SSL error log
* Revert "fix(imap): parse message/global structure like message/rfc822"

5.4.0
* fix(pgsql): add open connection count in debugging output

5.3.0
* fix(mime): restore SENT-DATE support in EOQualifier
* fix(imap): parse message/global structure like message/rfc822
* feat(imap): allow search by keyword
* fix(core): don't eat successive LF when decoding quoted printable
* core: accept range with no duration in date intersection
* feat(imap): add support for UID MOVE operation
* fix(mime): encode text parts individually
* fix(imap): force envelope subject to return a string

5.2.0
* fix(imap): parse messages quota
* fix(imap): don't unselect mailbox if none is selected
* fix(imap): flatten and sort inner threads
* fix(appserver): add timestamp to all web resources

6 files changed, 41 insertions, 34 deletions

diff --git a/devel/SOPE5/Makefile b/devel/SOPE5/Makefile
index 771c57390ce..44f2d1d42f4 100644
--- a/devel/SOPE5/Makefile
+++ b/devel/SOPE5/Makefile
@@ -1,10 +1,9 @@
-# $NetBSD: Makefile,v 1.2 2021/12/08 16:03:52 adam Exp $
+# $NetBSD: Makefile,v 1.3 2022/01/26 16:41:45 tm Exp $
 #
 
-DISTNAME=	SOPE-5.1.1
-PKGREVISION=	1
+DISTNAME=	SOPE-5.5.0
 CATEGORIES=	devel
-MASTER_SITES=	http://www.sogo.nu/files/downloads/SOGo/Sources/
+MASTER_SITES=	https://packages.inverse.ca/SOGo/sources/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	https://github.com/inverse-inc/sope
@@ -19,6 +18,7 @@ HAS_CONFIGURE=	yes
 
 CONFIGURE_ARGS=	--with-gnustep --enable-debug --disable-strip
 
+.include "../../devel/gnustep-make/gnustep.mk"
 .include "options.mk"
 
 .include "../../devel/gnustep-make/buildlink3.mk"
diff --git a/devel/SOPE5/PLIST b/devel/SOPE5/PLIST
index 79124d8b041..122af51d995 100644
--- a/devel/SOPE5/PLIST
+++ b/devel/SOPE5/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2021/06/14 16:51:39 gdt Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/01/26 16:41:45 tm Exp $
 bin/connect-EOAdaptor
 bin/load-EOAdaptor
 bin/wod
@@ -188,18 +188,18 @@ include/NGImap4/NGImap4ServerRoot.h
 include/NGImap4/NGImap4Support.h
 include/NGImap4/NGSieveClient.h
 include/NGImap4/NSString+Imap4.h
-include/NGLdap/EOQualifier+LDAP.h
-include/NGLdap/NGLdap.h
-include/NGLdap/NGLdapAttribute.h
-include/NGLdap/NGLdapConnection.h
-include/NGLdap/NGLdapDataSource.h
-include/NGLdap/NGLdapEntry.h
-include/NGLdap/NGLdapFileManager.h
-include/NGLdap/NGLdapGlobalID.h
-include/NGLdap/NGLdapModification.h
-include/NGLdap/NGLdapSearchResultEnumerator.h
-include/NGLdap/NGLdapURL.h
-include/NGLdap/NSString+DN.h
+${PLIST.ldap}include/NGLdap/EOQualifier+LDAP.h
+${PLIST.ldap}include/NGLdap/NGLdap.h
+${PLIST.ldap}include/NGLdap/NGLdapAttribute.h
+${PLIST.ldap}include/NGLdap/NGLdapConnection.h
+${PLIST.ldap}include/NGLdap/NGLdapDataSource.h
+${PLIST.ldap}include/NGLdap/NGLdapEntry.h
+${PLIST.ldap}include/NGLdap/NGLdapFileManager.h
+${PLIST.ldap}include/NGLdap/NGLdapGlobalID.h
+${PLIST.ldap}include/NGLdap/NGLdapModification.h
+${PLIST.ldap}include/NGLdap/NGLdapSearchResultEnumerator.h
+${PLIST.ldap}include/NGLdap/NGLdapURL.h
+${PLIST.ldap}include/NGLdap/NSString+DN.h
 include/NGMail/NGMBoxReader.h
 include/NGMail/NGMail.h
 include/NGMail/NGMailAddress.h
@@ -437,8 +437,8 @@ lib/libGDLAccess.so
 lib/libGDLAccess.so.4.9.63
 lib/libNGExtensions.so
 lib/libNGExtensions.so.4.9.203
-lib/libNGLdap.so
-lib/libNGLdap.so.4.9.35
+${PLIST.ldap}lib/libNGLdap.so
+${PLIST.ldap}lib/libNGLdap.so.4.9.35
 lib/libNGMime.so
 lib/libNGMime.so.4.9.3
 lib/libNGObjWeb.so
diff --git a/devel/SOPE5/PLIST.SunOS b/devel/SOPE5/PLIST.SunOS
index e51b8766e1a..cb6023149cd 100644
--- a/devel/SOPE5/PLIST.SunOS
+++ b/devel/SOPE5/PLIST.SunOS
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST.SunOS,v 1.1 2021/06/14 16:51:39 gdt Exp $
+@comment $NetBSD: PLIST.SunOS,v 1.2 2022/01/26 16:41:45 tm Exp $
 lib/libDOM.so.4.9
 lib/libEOControl.so.4.9
 lib/libGDLAccess.so.4.9
 lib/libNGExtensions.so.4.9
-lib/libNGLdap.so.4.9
+${PLIST.ldap}lib/libNGLdap.so.4.9
 lib/libNGMime.so.4.9
 lib/libNGObjWeb.so.4.9
 lib/libNGStreams.so.4.9
diff --git a/devel/SOPE5/distinfo b/devel/SOPE5/distinfo
index 8641cea28a4..ba99047b7a2 100644
--- a/devel/SOPE5/distinfo
+++ b/devel/SOPE5/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:14:12 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/01/26 16:41:45 tm Exp $
 
-BLAKE2s (SOPE-5.1.1.tar.gz) = 8ad956046822d57f2a1a832bb9e531559b285a07ba2915dba250f3df71a953b8
-SHA512 (SOPE-5.1.1.tar.gz) = c2f0d053dc452c2eb5c75befbff3265ec66cb317e2954edabb7049464660a7f605da39279b41bbac5ffd2ab5b7598d5c486e471b20a31ad151ba230a27b35719
-Size (SOPE-5.1.1.tar.gz) = 2295352 bytes
-SHA1 (patch-general.make) = 506e6c1cab6706190ab0c0817bd5c4bc338fbae9
+BLAKE2s (SOPE-5.5.0.tar.gz) = 057be37943f543f2c7673c2acb7029f791a9f68fb381d07391403a8a16d0ea46
+SHA512 (SOPE-5.5.0.tar.gz) = 2417c6761babebd4e57d7e608d3e47f451b989883dc5cb27e53016bce9801ec46a4d7b73581935e65a5028580eced56113546e70a60b0bd3aa0b69cb36f624fe
+Size (SOPE-5.5.0.tar.gz) = 2296909 bytes
+SHA1 (patch-general.make) = 56738aa2775cbc08db4acfe8576d6d13fbd41323
 SHA1 (patch-sope-core_NGStreams_NGActiveSocket.m) = 00475985f026b4b3838afee06bf477a2b3131e9c
 SHA1 (patch-sope-core_NGStreams_NGDescriptorFunctions.m) = 6560f602033ddeba52d96175e244921423bb6671
 SHA1 (patch-sope-core_NGStreams_NGInternetSocketAddress.m) = 7c945bf174e3de5f6f6daaaaa095956421a43bc3
diff --git a/devel/SOPE5/options.mk b/devel/SOPE5/options.mk
index 436b485a618..957cf8bea77 100644
--- a/devel/SOPE5/options.mk
+++ b/devel/SOPE5/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1 2021/06/14 16:51:39 gdt Exp $
+# $NetBSD: options.mk,v 1.2 2022/01/26 16:41:45 tm Exp $
 
 PKG_OPTIONS_VAR=			PKG_OPTIONS.SOPE
 
@@ -10,7 +10,7 @@ PKG_SUGGESTED_OPTIONS=			ldap pgsql
 
 .include "../../mk/bsd.options.mk"
 
-PLIST_VARS+=				pgsql mysql
+PLIST_VARS+=				pgsql mysql ldap
 
 .if !empty(PKG_OPTIONS:Mmysql)
 pre-configure:
@@ -32,6 +32,7 @@ CONFIGURE_ARGS+=			--disable-postgresql
 
 .if !empty(PKG_OPTIONS:Mldap)
 .include "../../databases/openldap-client/buildlink3.mk"
+PLIST.ldap=				yes
 .else
-CONFIGURE_ARGS+=			--disable-ldap
+CONFIGURE_ARGS+=			--disable-openldap
 .endif
diff --git a/devel/SOPE5/patches/patch-general.make b/devel/SOPE5/patches/patch-general.make
index ebd1438bb54..ab6f305d774 100644
--- a/devel/SOPE5/patches/patch-general.make
+++ b/devel/SOPE5/patches/patch-general.make
@@ -1,13 +1,19 @@
-$NetBSD: patch-general.make,v 1.1 2021/06/14 16:51:39 gdt Exp $
+$NetBSD: patch-general.make,v 1.2 2022/01/26 16:41:45 tm Exp $
 
 Don't include command line in output.
+Add missing linker flag objc in general.make because env or pkgsrc
+LDFLAGS are not working.
 
---- general.make.orig	2020-08-10 11:54:58.508538683 +0000
-+++ general.make
-@@ -23,5 +23,5 @@ endif
+--- general.make.orig	Tue Jan 18 16:17:06 2022
++++ general.make	Wed Jan 26 16:19:05 2022
+@@ -23,5 +23,8 @@
  # information plus the compiler flags used; that can
  # be afterwards read with:
  # readelf -p .GCC.command.line /path/to/elf_file
 -ADDITIONAL_OBJCFLAGS += -g $(call cc-option,-frecord-gcc-switches)
+-
 +ADDITIONAL_OBJCFLAGS += -g
- 
++# Ensure linking to objc works correctly. Because the
++# env or pkgsrc variable LDFLAGS isn't working it's
++# required configure it here:
++ADDITIONAL_LDFLAGS += -lobjc