Index: head/mail/annoyance-filter/Makefile
===================================================================
--- head/mail/annoyance-filter/Makefile	(revision 448198)
+++ head/mail/annoyance-filter/Makefile	(revision 448199)
@@ -1,39 +1,42 @@
 # Created by: Sergei Kolobov <sergei@FreeBSD.org>
 # $FreeBSD$
 
 PORTNAME=	annoyance-filter
 PORTVERSION=	1.0d
 PORTREVISION=	4
 CATEGORIES=	mail
 MASTER_SITES=	SF/annoyancefilter/annoyancefilter/${PORTVERSION} \
 		http://www.fourmilab.ch/annoyance-filter/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Adaptive Bayesian Junk Mail Filter
 
 LICENSE=	PD GPLv2+
 LICENSE_COMB=	multi
 LICENSE_FILE_PD=	${WRKSRC}/COPYING
 LICENSE_FILE_GPLv2+ =	${WRKSRC}/COPYING.GNU
 
 USE_GCC=	yes
 GNU_CONFIGURE=	yes
 
+# The port does not build with C++11 or later (GCC 6 defaults to -std=gnu++14).
+USE_CXXSTD=	gnu++03
+
 PORTDOCS=	INSTALL README *.pdf
 
 PLIST_FILES=	bin/annoyance-filter \
 		bin/annoyance-filter-run \
 		man/man1/annoyance-filter.1.gz
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-run ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${MANPREFIX}/man/man1
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	cd ${WRKSRC} && ${INSTALL_DATA} ${PORTDOCS} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/mail/annoyance-filter/files/patch-Makefile.in
===================================================================
--- head/mail/annoyance-filter/files/patch-Makefile.in	(revision 448198)
+++ head/mail/annoyance-filter/files/patch-Makefile.in	(revision 448199)
@@ -1,43 +1,65 @@
 --- Makefile.in.orig	2004-08-04 14:42:56 UTC
 +++ Makefile.in
-@@ -83,11 +83,11 @@ ipmpar.o:   DCDFlib/src/ipmpar.c
+@@ -76,18 +76,18 @@ all:	$(PROGS) $(DATA) $(DOCUMENTS)
+ DCDFLIB_OBJS = dcdflib.o ipmpar.o
  
+ dcdflib.o:  DCDFlib/src/dcdflib.c
+-	$(CXX) $(CFLAGS) -IDCDFlib/src -c DCDFlib/src/dcdflib.c
++	$(CXX) $(CXXFLAGS) -IDCDFlib/src -c DCDFlib/src/dcdflib.c
+ 
+ ipmpar.o:   DCDFlib/src/ipmpar.c
+-	$(CXX) $(CFLAGS) -IDCDFlib/src -c DCDFlib/src/ipmpar.c
++	$(CXX) $(CXXFLAGS) -IDCDFlib/src -c DCDFlib/src/ipmpar.c
+ 
  #   Annoyance filter program
  
 -$(PRODUCT):    $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o
 -	$(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) getopt.o getopt1.o -o $(PRODUCT) $(CFLAGS) $(LDFLAGS)
 +$(PRODUCT):    $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) 
-+	$(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -o $(PRODUCT) $(CFLAGS) $(LDFLAGS)
++	$(CXX) $(PRODUCT).o statlib.o $(DCDFLIB_OBJS) -o $(PRODUCT) $(CXXFLAGS) $(LDFLAGS)
  	@rm -f core core.*
  
 -$(PRODUCT).o: $(PRODUCT).cc config.h getopt.h
 +$(PRODUCT).o: $(PRODUCT).cc config.h 
  $(PRODUCT).cc: $(PRODUCT).w
  $(PRODUCT).tex: $(PRODUCT).w log.w $(TOOLS)
  $(PRODUCT).view: $(PRODUCT).dvi
 @@ -97,8 +97,8 @@ getopt1.o: getopt1.c getopt.h
  
  #   Statistical library
  
 -statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) getopt.o
 -	$(CXX) statlib_test.o statlib.o getopt.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS)
 +statlib_test: statlib_test.o statlib.o $(DCDFLIB_OBJS) 
-+	$(CXX) statlib_test.o statlib.o -o statlib_test $(DCDFLIB_OBJS) $(CFLAGS) $(LDFLAGS)
++	$(CXX) statlib_test.o statlib.o -o statlib_test $(DCDFLIB_OBJS) $(CXXFLAGS) $(LDFLAGS)
  
  statlib.o: statlib.cc config.h getopt.h
  statlib.cc: statlib.w
 @@ -276,14 +276,6 @@ printman:	$(PRODUCT).1
  	
  #   HTML edition of manual page
  
 -$(PRODUCT)_man_raw.html: $(PRODUCT).1
 -	$(MAN2HTML) -H $(MAN2HTMLHOST) $(PRODUCT).1 \
 -		>$(PRODUCT)_man_raw.html
 -	
 -$(PRODUCT)_man.html:	$(PRODUCT)_man_raw.html
 -	$(PERL) docutil/fixman2html.pl $(PRODUCT)_man_raw.html \
 -		>$(PRODUCT)_man.html
 -
  manhtml:	$(PRODUCT)_man.html
  
  # Test it
+@@ -350,10 +342,10 @@ winarch: $(PRODUCT).cc
+ 	$(CC) $(CFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $<
+ 
+ .cc.o:
+-	$(CXX) $(CFLAGS) $(INCLUDE_LIBS) -c $<
++	$(CXX) $(CXXFLAGS) $(INCLUDE_LIBS) -c $<
+ 
+ .cc:
+-	$(CXX) $(CFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $<
++	$(CXX) $(CXXFLAGS) $(INCLUDE_LIBS) $(LDFLAGS) -o $@ $<
+ 
+ .w.c:
+ 	$(CTANGLE) $<