Index: head/games/eboard/Makefile
===================================================================
--- head/games/eboard/Makefile	(revision 521884)
+++ head/games/eboard/Makefile	(revision 521885)
@@ -1,80 +1,80 @@
 # Created by: petef@FreeBSD.org
 # $FreeBSD$
 
 PORTNAME=	eboard
 PORTVERSION=	1.1.1
 PORTREVISION=	7
 CATEGORIES=	games
 MASTER_SITES=	SF \
 		SF/${PORTNAME}/eboard-extras/pack%201%20patchlevel%202/:p1 \
 		SF/${PORTNAME}/eboard-extras/pack%202/:p2
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		eboard-extras-1pl2.tar.gz:p1 \
 		eboard-extras-2.tar.gz:p2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	GTK+ chess board interface (mainly for FICS and chessd)
 
 LIB_DEPENDS=	libpng.so:graphics/png
 
 EXTRAS=		1pl2 2
-USES=		gnome perl5 pkgconfig shebangfix tar:bzip2
+USES=		compiler:c++11-lang gnome perl5 pkgconfig shebangfix tar:bzip2
 HAS_CONFIGURE=	yes
 USE_PERL5=	build
 USE_GNOME=	gtk20
 SHEBANG_FILES=	configure
 
 CONFIGURE_ARGS=	--prefix=${PREFIX} \
 		--extra-inc=${LOCALBASE}/include \
 		--extra-ld=${LOCALBASE}/lib
 
 INSTALL_TARGET=	install install-man
 
 OPTIONS_DEFINE=	JOYSTICK DOCS
 JOYSTICK_DESC=	Enable joystick support
 JOYSTICK_BUILD_DEPENDS=	${LOCALBASE}/include/linux/joystick.h:devel/evdev-proto
 
 DESKTOP_ENTRIES="eboard" \
 		"Play chess" \
 		"${PREFIX}/share/pixmaps/eboard.xpm" \
 		"eboard" \
 		"Game;BoardGame;GTK;" \
 		true
 
 .include <bsd.port.options.mk>
 
 post-extract:
 .for e in ${EXTRAS}
 	@cd ${WRKDIR} && ${GZIP_CMD} -dc \
 		${_DISTDIR}/eboard-extras-${e}.tar.gz | ${TAR} -xf -
 .endfor
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,g++,${CXX},' -e 's,-O6,${CXXFLAGS},' \
+	@${REINPLACE_CMD} -e 's,g++,${CXX},' -e 's|-O6|${CXXFLAGS}|' \
 		${WRKSRC}/configure
 
 .if empty(PORT_OPTIONS:MJOYSTICK)
 post-configure:
 	@${REINPLACE_CMD} -e '/^#define HAVE_LINUX_JOYSTICK_H 1/ d' \
 		${WRKSRC}/config.h
 .endif
 
 post-install:
 	@${LN} -sf ${LOCALBASE}/bin/timeseal \
 		${STAGEDIR}${DATADIR}/timeseal.FreeBSD
 .if ${PORT_OPTIONS:MDOCS}
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/README ${STAGEDIR}${DOCSDIR}
 .for file in Crafty.txt FICS-Timeseal.txt GNUChess4.txt GNUChess5.txt \
 	Scripts.txt Sjeng.txt Themes.txt
 	${INSTALL_DATA} ${WRKSRC}/Documentation/${file} ${STAGEDIR}${DOCSDIR}
 .endfor
 .endif
 .for extra in ${EXTRAS}
 	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} EBOARDCONFIG=${STAGEDIR}${PREFIX}/bin/eboard-config ${CONFIGURE_CMD} --prefix=${PREFIX}
 	@cd ${WRKDIR}/eboard-extras-${extra} && ${SETENV} ${MAKE_ENV} ${MAKE} install DATADIR=${STAGEDIR}${DATADIR}
 .endfor
 	@${INSTALL_DATA} ${WRKSRC}/icon-eboard.xpm ${STAGEDIR}${PREFIX}/share/pixmaps/eboard.xpm
 
 .include <bsd.port.mk>
Index: head/games/eboard/files/patch-configure
===================================================================
--- head/games/eboard/files/patch-configure	(revision 521884)
+++ head/games/eboard/files/patch-configure	(revision 521885)
@@ -1,43 +1,94 @@
---- configure.orig	2008-02-22 16:51:22.000000000 +0100
-+++ configure	2008-12-29 11:25:54.000000000 +0100
-@@ -354,7 +354,7 @@
+--- configure.orig	2020-01-02 23:06:25 UTC
++++ configure
+@@ -104,7 +104,7 @@ sub run_cmd {
+ }
+ 
+ sub cplusplus_lang {
+-    my @compilers = ( $cxx, 'g++', 'c++' );
++    my @compilers = ( $cxx, 'g++9', 'c++' );
+     my $x;
+     my $program = <<EOF;
+ #include <list>
+@@ -142,41 +142,6 @@ EOF
+     print TESTCC "$program";
+     close TESTCC;
+ 
+-    $cxx = 'no';
+-    for (@compilers) {
+-	$x = $_;
+-	print "  trying $x ... ";
+-
+-	unlink('test.o','yytest');
+-	log_file("test.cc");
+-
+-	if (run_cmd($x, '-c', 'test.cc', '-o', 'test.o') != 0) {
+-	  print "compilation FAILED\n";
+-	  next;
+-	}
+-
+-	if (run_cmd($x, 'test.o', '-o', 'yytest') != 0) {
+-	  print "compilation ok, linking FAILED\n";
+-	  next;
+-	}
+-
+-	$y = `./yytest`;
+-	if ($y ne "1710\n") {
+-	  print "compilation ok, linking ok, output FAILED\n";
+-	  next;
+-	}
+-	
+-	$cxx = $x;
+-	print "it works\n";
+-	last;
+-    }
+-    unlink('test.o','yytest','test.cc');
+-
+-    if ($cxx eq 'no') {
+-	print "FAIL\n";
+-	return 0;
+-    }
+-
+     return 1;
+ }
+ 
+@@ -354,7 +319,7 @@ sub header_check {
  	
  	log_file("test.cc");
  
 -	if (run_cmd($cxx,@cxxflags,"-c","test.cc","-o","xxtest.o") != 0) {
 +	if (0) {
  	    print ": no\n";
  	    $y = header_def($x);
  	    print CONFIGH "#undef $y\n";
-@@ -512,17 +512,9 @@
+@@ -512,17 +477,9 @@ if (!header_check("stdio.h","stdlib.h","string.h","uni
  #optional headers
  header_check("strings.h","sys/soundcard.h","sys/audioio.h","linux/joystick.h");
  
 -$t1=macro_check("netinet/in.h","IPPROTO_TCP","HAVE_IPPROTO_TCP_ON_IN_H");
 -$t2=macro_check("netinet/in.h","TCP_NODELAY","HAVE_TCP_NODELAY_ON_IN_H");
 -$t3=macro_check("netinet/in.h","SOL_TCP","HAVE_SOL_TCP_ON_IN_H");
 -
 -$t4=macro_check("netinet/tcp.h","IPPROTO_TCP","HAVE_IPPROTO_TCP_ON_TCP_H");
 -$t5=macro_check("netinet/tcp.h","TCP_NODELAY","HAVE_TCP_NODELAY_ON_TCP_H");
 -$t6=macro_check("netinet/tcp.h","SOL_TCP","HAVE_SOL_TCP_ON_TCP_H");
 -
  print "  net options: ";
  
 -if ($t2 != 0) {
 +if (0) {
      cppdef("USE_SOCK_OPTS");
      if ($t1!=0 && $t3!=0) {
  	cppundef("NEED_TCP_H");
-@@ -536,10 +528,10 @@
+@@ -536,10 +493,10 @@ if ($t2 != 0) {
  	print "netinet/tcp.h not required, SOL_TCP present.\n";
      }
  } else {
 -    if ($t5 != 0 && ($t1!=0 || $t4!=0) && ($t3!=0 || $t6!=0) ) {
 +    if (1) {
  	cppdef("NEED_TCP_H");
  	cppdef("USE_SOCK_OPTS");
 -	if ($t1!=0 || $t4!=0) {
 +	if (1) {
  	    cppdef("USE_IPPROTO_TCP");
  	    print "netinet/tcp.h required, IPPROTO_TCP present.\n";
  	} else {