Index: head/games/stockfish/Makefile
===================================================================
--- head/games/stockfish/Makefile	(revision 462772)
+++ head/games/stockfish/Makefile	(revision 462773)
@@ -1,70 +1,70 @@
 # Created by: Gautam Mani <execve@gmail.com>
 # $FreeBSD$
 
 PORTNAME=	stockfish
-PORTVERSION=	8
+DISTVERSION=	9
+DISTVERSIONSUFFIX=	-src
 CATEGORIES=	games
-MASTER_SITES=	http://stockfish.s3.amazonaws.com/:src
-DISTNAME=	${PORTNAME}-${PORTVERSION}-src
-DISTFILES=	${PORTNAME}-${PORTVERSION}-src.zip:src
+MASTER_SITES=	http://stockfish.s3.amazonaws.com/
 
 MAINTAINER=	execve@gmail.com
 COMMENT=	Open source chess engine
 
 LICENSE=	GPLv3
+LICENSE_FILE=	${WRKSRC}/../Copying.txt
 
 NOT_FOR_ARCHS=	sparc64
 BROKEN_aarch64=	Fails to build: cannot detect architecture
 BROKEN_armv6=	Fails to configure: config-sanity: Error 1
 BROKEN_armv7=	Fails to configure: config-sanity: Error 1
 BROKEN_mips64=	Fails to build: cannot detect architecture
 
 USES=		compiler gmake zip
 
-WRKSRC=		${WRKDIR}/${DISTNAME}/src
+NO_WRKSUBDIR=	yes
+WRKSRC_SUBDIR=	src
 MYARCH=		${ARCH}
 MYCC=		${COMPILER_TYPE}
 TGTBLD=		build
 
 PLIST_FILES=	bin/stockfish
-PORTDATA=
 PORTDOCS=	Readme.md
 
 OPTIONS_DEFINE=	DOCS POPCNT
 
 POPCNT_DESC=	Use the POPCNT instruction
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MPOPCNT} && ${ARCH} != amd64
 BROKEN=		POPCNT compiles only on amd64
 .endif
 
 # workaround the ARCH usage in the stockfish Makefile
 .if ${ARCH} == "i386"
 MYARCH=		x86-32
 .elif ${ARCH} == "amd64"
 .  if ${PORT_OPTIONS:MPOPCNT}
 MYARCH=		x86-64-modern
 .  else
 MYARCH=		x86-64
 .  endif
 .elif ${ARCH} == powerpc
 MYARCH=		ppc-32
 .elif ${ARCH} == powerpc64
 MYARCH=		ppc-64
 .endif
 
 ALL_TARGET=	${TGTBLD} ARCH=${MYARCH} COMP=${MYCC}
 
 post-patch:
 	@${REINPLACE_CMD} -e "s/^PREFIX =/PREFIX ?=/" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/stockfish ${STAGEDIR}${PREFIX}/bin
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/Readme.md ${STAGEDIR}${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/../Readme.md ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/games/stockfish/distinfo
===================================================================
--- head/games/stockfish/distinfo	(revision 462772)
+++ head/games/stockfish/distinfo	(revision 462773)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499583495
-SHA256 (stockfish-8-src.zip) = 7bad36f21f649ab24f6d7786bbb1b74b3e4037f165f32e3d42d1ae19c8874ce9
-SIZE (stockfish-8-src.zip) = 159017
+TIMESTAMP = 1519331941
+SHA256 (stockfish-9-src.zip) = ba2e72d6973479c8c839c7f4a095d121829ebe8df39b71ebf291c84e5cb3e36e
+SIZE (stockfish-9-src.zip) = 171925
Index: head/games/stockfish/files/patch-Makefile
===================================================================
--- head/games/stockfish/files/patch-Makefile	(revision 462772)
+++ head/games/stockfish/files/patch-Makefile	(revision 462773)
@@ -1,18 +1,15 @@
---- Makefile.orig	2017-07-09 16:40:08 UTC
+--- Makefile.orig	2018-02-22 21:13:38 UTC
 +++ Makefile
-@@ -149,7 +149,6 @@ endif
- 
- ifeq ($(COMP),gcc)
- 	comp=gcc
--	CXX=g++
+@@ -205,10 +205,12 @@ ifeq ($(COMP),clang)
+ 	CXX=clang++
  	CXXFLAGS += -pedantic -Wextra -Wshadow
+ ifneq ($(KERNEL),Darwin)
++ifneq ($(KERNEL),FreeBSD)
+ ifneq ($(KERNEL),OpenBSD)
+ 	LDFLAGS += -latomic
+ endif
+ endif
++endif
  
  	ifeq ($(ARCH),armv7)
-@@ -198,7 +197,6 @@ endif
- 
- ifeq ($(COMP),clang)
- 	comp=clang
--	CXX=clang++
- 	CXXFLAGS += -pedantic -Wextra -Wshadow
- 
- 	ifeq ($(ARCH),armv7)
+ 		ifeq ($(OS),Android)