Index: head/mail/avenger/Makefile
===================================================================
--- head/mail/avenger/Makefile	(revision 483215)
+++ head/mail/avenger/Makefile	(revision 483216)
@@ -1,54 +1,56 @@
 # Created by: dm
 # $FreeBSD$
 
 PORTNAME=	avenger
-PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTVERSION=	0.8.5
 CATEGORIES=	mail
 MASTER_SITES=	http://www.mailavenger.org/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Anti-spam SMTP server
 
-LICENSE=	GPLv2+ # though COPYING is GPLv3
+LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 USES=		bdb ssl
+
 GNU_CONFIGURE=	yes
 
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 
 PORTDOCS=	INSTALL INSTALL.html README NEWS
 SUB_FILES=	pkg-message
 
 CONFIGURE_ENV=	WFLAGS='-Wall'
 CONFIGURE_ARGS=	--enable-ssl=${OPENSSLBASE} \
 		--with-db=${LOCALBASE} \
 		--with-etcdir=${ETCDIR}
 
-OPTIONS_DEFINE=	SASL DOCS
+OPTIONS_DEFINE=	DOCS SASL
 
-SASL_CONFIGURE_ON=	--enable-sasl
+SASL_CONFIGURE_ENABLE=	sasl
 SASL_LIB_DEPENDS=	libsasl2.so:security/cyrus-sasl2
 
 post-patch:
 	@${REINPLACE_CMD} -e \
 		'/for vers in/s|5.*;|${BDB_LIB_NAME:S,db-,,};|' \
 		${WRKSRC}/configure
 
 post-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/asmtpd.conf \
 		${STAGEDIR}${ETCDIR}/asmtpd.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/unknown \
 		${STAGEDIR}${ETCDIR}/unknown.sample
 	${INSTALL_DATA} ${WRKSRC}/etc/pf.os ${STAGEDIR}${PREFIX}/share
 
 	@${MKDIR} ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/smtp-filter.pf ${STAGEDIR}${DATADIR}
-	${INSTALL_DATA} ${WRKSRC}/etc/avsendmail.m4 ${STAGEDIR}${DATADIR}
+	(cd ${WRKSRC}/etc ; ${INSTALL_DATA} smtp-filter.pf avsendmail.m4 \
+		${STAGEDIR}${DATADIR})
 
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/avenger/distinfo
===================================================================
--- head/mail/avenger/distinfo	(revision 483215)
+++ head/mail/avenger/distinfo	(revision 483216)
@@ -1,2 +1,3 @@
-SHA256 (avenger-0.8.4.tar.gz) = cd6be345687fa0e6be056a575865b937f8ebcb486cb4f8da2d74bf4c4bdd64ce
-SIZE (avenger-0.8.4.tar.gz) = 890192
+TIMESTAMP = 1540694687
+SHA256 (avenger-0.8.5.tar.gz) = b0fc3e2e03ed010e95e561367fce7b087968df7ea6056251eba95cad14d26d37
+SIZE (avenger-0.8.5.tar.gz) = 910358
Index: head/mail/avenger/files/patch-Makefile.in
===================================================================
--- head/mail/avenger/files/patch-Makefile.in	(revision 483215)
+++ head/mail/avenger/files/patch-Makefile.in	(revision 483216)
@@ -1,14 +1,14 @@
---- ./Makefile.in.orig	2013-03-08 21:13:45.000000000 +0100
-+++ ./Makefile.in	2013-03-08 21:16:55.000000000 +0100
-@@ -287,9 +287,9 @@
+--- Makefile.in.orig	2018-10-09 06:38:27 UTC
++++ Makefile.in
+@@ -386,9 +386,9 @@ top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  LYNX = lynx
 -SUBDIRS = libasync asmtpd util local doc etc
 +SUBDIRS = libasync asmtpd util local doc
  libexec_SCRIPTS = avenger
 -sample_DATA = INSTALL INSTALL.html
 +sample_DATA =
  CLEANFILES = core *.core *~
  DISTCLEANFILES = autom4te*.cache config.status config.log avenger
  EXTRA_DIST = .gitignore avenger.in INSTALL.html LICENSE