--- mail/filtermail/Makefile	(revision 540358)
+++ mail/filtermail/Makefile	(working copy)
@@ -1,22 +1,28 @@ 
 # $FreeBSD$
 
 PORTNAME=	filtermail
-PORTVERSION=	0.8.3
-PORTREVISION=	1
+PORTVERSION=	0.8.6
 CATEGORIES=	mail
 MASTER_SITES=	http://sourceforge.net/projects/mailfilter/files/Mailfilter/
 DISTNAME=	mailfilter-${PORTVERSION}
 
-MAINTAINER=	jmc-filtermail@milibyte.co.uk
+MAINTAINER=	jmc-freebsd2@milibyte.co.uk
 COMMENT=	Filter mail on a POP3 server: saves downloading spam
 
 LICENSE=	GPLv3
 
+.include <bsd.port.options.mk>
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
+BUILD_DEPENDS=	${LOCALBASE}/bin/flex:textproc/flex
+.endif
+
+USES=		bison gmake ssl
+
 # This port is filtermail, but the author called it mailfilter. To avoid a
 #  clash with another port called mailfilter, we change all files
 #  installed by this port from the form *mailfilter* to the form
 #  *filtermail*, and similarly the names in the man pages.
-#
+
 EXTRACT_CMD=	${GZIP_CMD}
 EXTRACT_BEFORE_ARGS=	-dc
 EXTRACT_AFTER_ARGS=	| ${SED} 's/[mM][aA][iI][lL][fF][iI][lL][tT][eE][rR]/filtermail/g' | ${TAR} -xf -
@@ -23,11 +29,14 @@ 
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
-USES=		bison gmake ssl
 GNU_CONFIGURE=	yes
 MAKE_JOBS_UNSAFE=	yes
 
 CPPFLAGS+=	-I${LOCALBASE}/include
+.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300000
+CPPFLAGS+=	-I${LOCALBASE}/include/flex
+FLEX=${LOCALBASE}/bin/flex
+.endif
 LDFLAGS+=	-L${LOCALBASE}/lib
 
 PLIST_FILES=	bin/${PORTNAME} \
--- mail/filtermail/distinfo	(revision 540358)
+++ mail/filtermail/distinfo	(working copy)
@@ -1,2 +1,3 @@ 
-SHA256 (mailfilter-0.8.3.tar.gz) = 60a40e1d35148fd50a2627fc4bbe47626b886614db50f88c0a21d934df63cb7a
-SIZE (mailfilter-0.8.3.tar.gz) = 425337
+TIMESTAMP = 1593601356
+SHA256 (mailfilter-0.8.6.tar.gz) = f4e6b94996e95b7d45cec9fadee8fc99a6832c42dcfd86e2a1fd821deaf3069c
+SIZE (mailfilter-0.8.6.tar.gz) = 471479
--- mail/filtermail/pkg-descr	(revision 540358)
+++ mail/filtermail/pkg-descr	(working copy)
@@ -1,5 +1,5 @@ 
 This is mail/filtermail, a port of mailfilter, renamed because another
-mailfilter exists in the ports tree.
+mailfilter previously existed in the ports tree.
 
 It filters mail on a pop3 server, allowing junk to be deleted on the
 server rather than after it has been downloaded, and integrates with other