diff --git a/mail/archiveopteryx-devel/Makefile b/mail/archiveopteryx-devel/Makefile
index 45395f3fad53..d4863b480469 100644
--- a/mail/archiveopteryx-devel/Makefile
+++ b/mail/archiveopteryx-devel/Makefile
@@ -1,67 +1,66 @@
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.99.20181030
 PORTREVISION=	2
 CATEGORIES=	mail
 PKGNAMESUFFIX=	-devel
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 WWW=		https://www.archiveopteryx.org/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	aox
 GH_PROJECT=	aox
 GH_TAGNAME=	96ab17e
 
 USES=		compiler perl5 ssl
 USE_PERL5=	build
-WITH_PGSQL=	client
 
 CONFLICTS_INSTALL=	archiveopteryx # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport
 
 PORTDOCS=	COPYING README license.txt
 
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
 
 CONFLICTS=	archiveopteryx
 
 USERS=		aox
 GROUPS=		aox
 PLIST_SUB+=	USERS="${USERS}"
 PLIST_SUB+=	GROUPS="${GROUPS}"
 
 JAM?=		${LOCALBASE}/bin/jam
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD with clang in base
 .if ${OPSYS} == FreeBSD
 .if ${CHOSEN_COMPILER_TYPE} == clang
 JAMARG+=	"-sCLANG=1"
 .endif
 .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>
diff --git a/mail/archiveopteryx/Makefile b/mail/archiveopteryx/Makefile
index 7d24b3ec5928..d32530f94b23 100644
--- a/mail/archiveopteryx/Makefile
+++ b/mail/archiveopteryx/Makefile
@@ -1,65 +1,64 @@
 PORTNAME=	archiveopteryx
 PORTVERSION=	3.2.0
 PORTREVISION=	10
 CATEGORIES=	mail
 MASTER_SITES=	http://archiveopteryx.org/download/
 
 MAINTAINER=	feld@FreeBSD.org
 COMMENT=	Advanced PostgreSQL-based IMAP/POP server
 WWW=		https://www.archiveopteryx.org/
 
 LICENSE=	MIT
 
 BUILD_DEPENDS=	jam:devel/jam
 
 USES=		compiler perl5 ssl tar:bzip2
 USE_PERL5=	build
-WITH_PGSQL=	client
 
 CONFLICTS_INSTALL=	archiveopteryx-devel # bin/aox bin/aoxdeliver bin/aoxexport bin/aoximport
 
 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
 
 OPTIONS_DEFINE=	DOCS
 
 .include <bsd.port.pre.mk>
 
 # force Clang when on FreeBSD with clang in base
 .if ${OPSYS} == FreeBSD
 .if ${CHOSEN_COMPILER_TYPE} == clang
 JAMARG+=	"-sCLANG=1"
 .endif
 .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
 .if ( ${OPSYS} == FreeBSD && ${OSVERSION} >= 1400092 && ${SSL_DEFAULT} == base ) || ${SSL_DEFAULT:Mopenssl3*}
 	@${REINPLACE_CMD} -e 's|-Werror|-Werror -DOPENSSL_API_COMPAT=0x10100000L|g' \
 		${WRKSRC}/Jamsettings
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG}
 
 do-install:
 	@cd ${WRKSRC} && ${JAM} ${JAMARG} install
 
 .include <bsd.port.post.mk>