Index: branches/2017Q1/mail/archiveopteryx/Makefile
===================================================================
--- branches/2017Q1/mail/archiveopteryx/Makefile	(revision 431089)
+++ branches/2017Q1/mail/archiveopteryx/Makefile	(revision 431090)
@@ -1,58 +1,58 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
 BROKEN_powerpc64=	Does not build
 
 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
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -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: branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp
===================================================================
--- branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp	(nonexistent)
+++ branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp	(revision 431090)
@@ -0,0 +1,11 @@
+--- server/tlsthread.cpp.orig	2017-01-10 15:10:07 UTC
++++ server/tlsthread.cpp
+@@ -93,7 +93,7 @@ void TlsThread::setup()
+     SSL_library_init();
+ 
+     ctx = ::SSL_CTX_new( SSLv23_server_method() );
+-    int options = SSL_OP_ALL
++    long options = SSL_OP_ALL
+                   // also try to pick the same ciphers suites more often
+                   | SSL_OP_CIPHER_SERVER_PREFERENCE
+                   // and don't use SSLv2, even if the client wants to

Property changes on: branches/2017Q1/mail/archiveopteryx/files/patch-server_tlsthread.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1/mail/archiveopteryx-devel/Makefile
===================================================================
--- branches/2017Q1/mail/archiveopteryx-devel/Makefile	(revision 431089)
+++ branches/2017Q1/mail/archiveopteryx-devel/Makefile	(revision 431090)
@@ -1,65 +1,65 @@
 # Created by: Ashish SHUKLA <ashish@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.99.20160129
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 
 LICENSE=	MIT
 
 BROKEN_powerpc64=	Does not build
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aox
 GH_PROJECT=	aox
 GH_TAGNAME=	e10c73a
 
 USES=		perl5 ssl tar:bzip2
 USE_PERL5=	build
 WITH_PGSQL=	client
 
 PORTDOCS=	COPYING README license.txt
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	archiveopteryx-[0-9]*
 
 USERS=		aox
 GROUPS=		aox
 PLIST_SUB+=	USERS="${USERS}"
 PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD 10+
 .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000000
 JAMARG=	"-sCLANG=1"
 .endif
 
 post-patch:
 	@${GREP} -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: branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
===================================================================
--- branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp	(nonexistent)
+++ branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp	(revision 431090)
@@ -0,0 +1,11 @@
+--- server/tlsthread.cpp.orig	2017-01-10 15:06:31 UTC
++++ server/tlsthread.cpp
+@@ -93,7 +93,7 @@ void TlsThread::setup()
+     SSL_library_init();
+ 
+     ctx = ::SSL_CTX_new( SSLv23_server_method() );
+-    int options = SSL_OP_ALL
++    long options = SSL_OP_ALL
+                   // also try to pick the same ciphers suites more often
+                   | SSL_OP_CIPHER_SERVER_PREFERENCE
+                   // and don't use SSLv2, even if the client wants to

Property changes on: branches/2017Q1/mail/archiveopteryx-devel/files/patch-server_tlsthread.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2017Q1
===================================================================
--- branches/2017Q1	(revision 431089)
+++ branches/2017Q1	(revision 431090)

Property changes on: branches/2017Q1
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r431089