svn commit: r484315 - in head/www/sogo4: . files

[Jose Alonso Cardenas Marquez]

Author: acm
Date: Tue Nov  6 18:08:37 2018
New Revision: 484315
URL: https://svnweb.freebsd.org/changeset/ports/484315

Log:
  - Fix build on 12-BETA3
  
  Reported by:	pkg-fallout

Modified:
  head/www/sogo4/Makefile
  head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m

Modified: head/www/sogo4/Makefile
==============================================================================
--- head/www/sogo4/Makefile	Tue Nov  6 18:06:24 2018	(r484314)
+++ head/www/sogo4/Makefile	Tue Nov  6 18:08:37 2018	(r484315)
@@ -2,6 +2,7 @@
 
 PORTNAME=		sogo4
 PORTVERSION=		4.0.4
+PORTREVISION=		1
 CATEGORIES=		www gnustep
 MASTER_SITES=		http://www.sogo.nu/files/downloads/SOGo/Sources/
 DISTNAME=		SOGo-${PORTVERSION}

Modified: head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m
==============================================================================
--- head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m	Tue Nov  6 18:06:24 2018	(r484314)
+++ head/www/sogo4/files/patch-UI-MailPartViewers_UIxMailPartSignedViewer.m	Tue Nov  6 18:08:37 2018	(r484315)
@@ -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 */
-       }
-     }