svn commit: r467335 - in branches/2018Q2/mail/archiveopteryx: . files

[Mark Felder]

Author: feld
Date: Sat Apr 14 17:15:06 2018
New Revision: 467335
URL: https://svnweb.freebsd.org/changeset/ports/467335

Log:
  MFH: r467334
  
  mail/archiveopteryx: Fix build with modern clang

Modified:
  branches/2018Q2/mail/archiveopteryx/Makefile
  branches/2018Q2/mail/archiveopteryx/files/patch-core__md5.cpp
Directory Properties:
  branches/2018Q2/   (props changed)

Modified: branches/2018Q2/mail/archiveopteryx/Makefile
==============================================================================
--- branches/2018Q2/mail/archiveopteryx/Makefile	Sat Apr 14 17:14:12 2018	(r467334)
+++ branches/2018Q2/mail/archiveopteryx/Makefile	Sat Apr 14 17:15:06 2018	(r467335)
@@ -3,7 +3,7 @@
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
@@ -12,8 +12,6 @@ COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
-BROKEN_armv6=		fails to build: core/md5.cpp:55:5: 'register' storage class specifier is deprecated and incompatible with C++17
-BROKEN_armv7=		fails to build: core/md5.cpp:55:5: 'register' storage class specifier is deprecated and incompatible with C++17
 BROKEN_powerpc64=	fails to build: /bin/sh: clang: not found
 
 BUILD_DEPENDS=	jam:devel/jam

Modified: branches/2018Q2/mail/archiveopteryx/files/patch-core__md5.cpp
==============================================================================
--- branches/2018Q2/mail/archiveopteryx/files/patch-core__md5.cpp	Sat Apr 14 17:14:12 2018	(r467334)
+++ branches/2018Q2/mail/archiveopteryx/files/patch-core__md5.cpp	Sat Apr 14 17:15:06 2018	(r467335)
@@ -1,6 +1,15 @@
---- ./core/md5.cpp.orig	2014-03-06 13:46:23.918398965 -0600
-+++ ./core/md5.cpp	2014-03-06 13:46:30.784414914 -0600
-@@ -149,12 +149,9 @@
+--- core/md5.cpp.orig	2014-03-10 13:44:59 UTC
++++ core/md5.cpp
+@@ -52,7 +52,7 @@ void MD5::init()
+ 
+ void MD5::add( const char *str, uint len )
+ {
+-    register uint32 t;
++    uint32 t;
+ 
+     /* It's not possible to add() data, call hash(), then add more data
+        and call hash() again, because hash() destroys the accumulated
+@@ -149,12 +149,9 @@ EString MD5::hash()
      }
      swapBytes( in, 14 );
  
@@ -13,3 +22,12 @@
      transform();
      swapBytes( (char *)buf, 4 );
  
+@@ -247,7 +244,7 @@ EString MD5::HMAC( const EString &secret
+ 
+ void MD5::transform()
+ {
+-    register uint32 a, b, c, d;
++    uint32 a, b, c, d;
+     uint32 *inw = (uint32 *)in;
+ 
+     a = buf[0];