Index: head/mail/archiveopteryx/Makefile
===================================================================
--- head/mail/archiveopteryx/Makefile	(revision 467333)
+++ head/mail/archiveopteryx/Makefile	(revision 467334)
@@ -1,61 +1,59 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
 MAINTAINER=	feld@FreeBSD.org
 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
 
 USES=		perl5 ssl tar:bzip2
 USE_PERL5=	build
 WITH_PGSQL=	client
 
 PORTDOCS=	COPYING README bsd.txt
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 USERS=		aox
 GROUPS=		aox
 PLIST_SUB+=	USERS="${USERS}"
 PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 JAMARG+=	-dx
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD
 .if ${OPSYS} == FreeBSD
 JAMARG+=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${EGREP} -Rl '%%[[:alpha:]]+%%' ${WRKSRC} |${XARGS} ${REINPLACE_CMD} \
 		-e 's,%%PREFIX%%,${PREFIX},g'
 	${REINPLACE_CMD} -e "s|\(C++FLAGS =\)|\1 -I${OPENSSLINC}|g" \
 		-e"s|INSTALLROOT ?= \"\" ;|INSTALLROOT = \"${STAGEDIR}\" ;|" \
 		${WRKSRC}/Jamsettings
 	${REINPLACE_CMD} -e "s|\(-lcrypto\)|-L${OPENSSLLIB} \1|g" \
 		${WRKSRC}/server/Jamfile
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}
 
 do-install:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG} install
 
 .include <bsd.port.post.mk>
Index: head/mail/archiveopteryx/files/patch-core__md5.cpp
===================================================================
--- head/mail/archiveopteryx/files/patch-core__md5.cpp	(revision 467333)
+++ head/mail/archiveopteryx/files/patch-core__md5.cpp	(revision 467334)
@@ -1,15 +1,33 @@
---- ./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 );
  
 -#pragma GCC diagnostic push
 -#pragma GCC diagnostic ignored "-Wstrict-aliasing"
      /* Append length in bits and transform. */
      ((uint32 *)in)[14] = bits[0];
      ((uint32 *)in)[15] = bits[1];
 -#pragma GCC diagnostic pop
      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];