Index: head/www/sogo4/Makefile
===================================================================
--- head/www/sogo4/Makefile	(revision 484314)
+++ head/www/sogo4/Makefile	(revision 484315)
@@ -1,64 +1,65 @@
 # $FreeBSD$
 
 PORTNAME=		sogo4
 PORTVERSION=		4.0.4
+PORTREVISION=		1
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}
 
 MAINTAINER=		acm@FreeBSD.org
 COMMENT=		Groupware server with a focus on scalability and open standards
 
 LICENSE=		GPLv2
 
 LIB_DEPENDS=		libmemcached.so:databases/libmemcached \
 			libcurl.so:ftp/curl \
 			libDOM.so:devel/sope4
 RUN_DEPENDS=		zip:archivers/zip
 
 OPTIONS_DEFINE=	ACTIVESYNC
 OPTIONS_SUB=		yes
 
 ACTIVESYNC_DESC=	Enable support for ActiveSync protocol
 ACTIVESYNC_LIB_DEPENDS=	libwbxml2.so:textproc/wbxml2
 
 USERS=			sogod
 GROUPS=			sogod
 
 USES=			gnustep ssl objc
 USE_GNUSTEP=		base build
 USE_LDCONFIG=		${GNUSTEP_LOCAL_LIBRARIES}/sogo
 
 CONFLICTS?=		sogo[2-4]-activesync-[0-9]* sogo[2-3]-[0-9]*
 
 USE_RC_SUBR=		sogod
 
 SUB_FILES+=		pkg-message
 SUB_LIST+=		GNUSTEP_LOCAL_TOOLS=${GNUSTEP_LOCAL_TOOLS} \
 			GNUSTEP_MAKEFILES=${GNUSTEP_MAKEFILES}
 ETCDIR=			${PREFIX}/etc/${PORTNAME:S/4//}
 CONFIGURE_ARGS=		--disable-debug --enable-strip
 
 post-patch:
 	@${GREP} -rlF '/etc/sogo' ${WRKSRC} \
 		| ${XARGS} ${REINPLACE_CMD} 's#/etc/sogo#${PREFIX}/etc/sogo#g'
 	@${REINPLACE_CMD} -e 's|/usr/|/usr/local/|g' ${WRKSRC}/Apache/SOGo.conf
 
 post-patch-ACTIVESYNC-on:
 	@${REINPLACE_CMD} -e 's/Tools/Tools ActiveSync/' ${WRKSRC}/GNUmakefile
 
 do-configure:
 	cd ${WRKSRC} ; . ${GNUSTEP_MAKEFILES}/GNUstep.sh ; ./configure ${CONFIGURE_ARGS}
 
 post-install:
 	${MKDIR} ${STAGEDIR}/var/spool/sogo
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/Scripts/sogo.conf ${STAGEDIR}${ETCDIR}/sogo.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo.conf ${STAGEDIR}${ETCDIR}/SOGo-Apache.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/Apache/SOGo-apple-ab.conf ${STAGEDIR}${ETCDIR}/SOGo-apple-ab.Apache.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/expire-autoreply.creds.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${FILESDIR}/ealarms-notify.creds.sample ${STAGEDIR}${ETCDIR}/
 	${INSTALL_DATA} ${FILESDIR}/cron-ealarms-notify.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 	${INSTALL_DATA} ${FILESDIR}/cron-expire-autoreply.sample ${STAGEDIR}${PREFIX}/GNUstep/Local/Tools/Admin/
 
 .include <bsd.port.mk>
Index: head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
===================================================================
--- head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m	(revision 484314)
+++ head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m	(revision 484315)
@@ -1,21 +1,18 @@
---- UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-11-04 23:25:20.140369000 -0500
-+++ UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-11-04 23:28:00.684899000 -0500
-@@ -173,15 +173,15 @@
+--- UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-10-23 14:22:36.000000000 -0500
++++ UI/MailPartViewers/UIxMailPartSignedViewer.m	2018-11-06 13:02:05.090224000 -0500
+@@ -169,13 +169,13 @@
+       if (err)
+         {
+ #ifdef HAVE_GNUTLS
+-          const char* sslError;
++          NSString* sslError;
  	  ERR_load_crypto_strings();
            SSL_load_error_strings();
            sslError = ERR_reason_error_string(err);
--          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
-+          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "No error information available"]] retain];
+           validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
  #elif OPENSSL_VERSION_NUMBER < 0x10100000L
-           const char* sslError;
+-          const char* sslError;
++          NSString* sslError;
  	  ERR_load_crypto_strings();
            SSL_load_error_strings();
            sslError = ERR_reason_error_string(err);
--          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : @"No error information available"]] retain];
-+          validationMessage = [[self labelForKey: [NSString stringWithUTF8String: sslError ? sslError : "No error information available"]] retain];
- #else
--	  validationMessage = [[self labelForKey: @"No error information available"] retain];
-+	  validationMessage = [[self labelForKey: "No error information available"] retain];
- #endif /* HAVE_GNUTLS */
-       }
-     }