Index: head/games/widelands/Makefile
===================================================================
--- head/games/widelands/Makefile	(revision 495387)
+++ head/games/widelands/Makefile	(revision 495388)
@@ -1,52 +1,48 @@
 # Created by: Bartosz Fabianowski <freebsd@chillt.de>
 # $FreeBSD$
 
 PORTNAME=	widelands
 DISTVERSION=	build19
 PORTREVISION=	16
 CATEGORIES=	games
 MASTER_SITES=	https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
 MAINTAINER=	amdmi3@FreeBSD.org
 COMMENT=	Realtime strategy game inspired by Settlers II
 
 LICENSE=	GPLv2+
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libicuuc.so:devel/icu \
 		libboost_regex.so:devel/boost-libs
 
-USES=		cmake compiler:c++11-lib gettext \
-		tar:bzip2 python:build
+USES=		cmake compiler:c++11-lib gettext gl \
+		tar:bzip2 python:build sdl
 CMAKE_ARGS=	-DWL_INSTALL_BASEDIR="${PREFIX}" \
 		-DWL_INSTALL_DATADIR="${DATADIR}" \
 		-DWL_INSTALL_DOCDIR="${DOCSDIR}" \
 		-DWL_VERSION="${DISTVERSION}" \
 		-DWL_OPTIMIZE_FLAGS=""
 USE_GL=		gl glew
 USE_SDL=	sdl2 mixer2 image2 net2 ttf2
-CXXFLAGS_powerpc=	-Wno-maybe-uninitialized
-CXXFLAGS_powerpcspe=	-Wno-maybe-uninitialized
-CXXFLAGS_powerpc64=	-Wno-maybe-uninitialized
-CXXFLAGS_sparc64=	-Wno-maybe-uninitialized
 
 PORTDATA=	*
 PORTDOCS=	*
 
 DESKTOP_ENTRIES="Widelands" \
 		"" \
 		"${DATADIR}/pics/wl-ico-64.png" \
 		"widelands" \
 		"Game;StrategyGame;" \
 		""
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \
 		${WRKSRC}/cmake/Modules/*.cmake
 
 .include <bsd.port.mk>
Index: head/games/widelands/files/patch-CMakeLists.txt
===================================================================
--- head/games/widelands/files/patch-CMakeLists.txt	(revision 495387)
+++ head/games/widelands/files/patch-CMakeLists.txt	(revision 495388)
@@ -1,47 +1,58 @@
 --- CMakeLists.txt.orig	2016-11-10 07:28:01 UTC
 +++ CMakeLists.txt
 @@ -93,7 +93,7 @@ endif (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQU
  if(CMAKE_BUILD_TYPE STREQUAL "Debug")
    set(WL_DEBUG_FLAGS "-g -DDEBUG")
  elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
 -  set(WL_OPTIMIZE_FLAGS "-O3")
 +  set(WL_OPTIMIZE_FLAGS "-O3" CACHE STRING "")
    set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
  elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
    set(WL_OPTIMIZE_FLAGS "-O3")
+@@ -179,8 +179,8 @@ endif()
+ # Turn some warnings into errors.
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=format-security")
+ wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=return-type")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=shadow")
+-wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Werror=uninitialized")
++wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wshadow")
++wl_add_flag(WL_COMPILE_DIAGNOSTICS "-Wuninitialized")
+ 
+ IF (WIN32)
+   add_definitions(-DMINGW_HAS_SECURE_API)
 @@ -225,7 +225,7 @@ if (NOT DEFINED WL_VERSION)
  else (NOT DEFINED WL_VERSION)
    add_custom_target (
      InputRevision ALL
 -    COMMAND ${CMAKE_COMMAND -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_VERSION=${WL_VERSION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InputRevision.cmake
 +    COMMAND ${CMAKE_COMMAND} -DWL_INSTALL_BASEDIR=${WL_INSTALL_BASEDIR} -DWL_VERSION=${WL_VERSION} -DCMAKE_BUILD_TYPE=${CMAKE_BUILD_TYPE} -DSOURCE_DIR=${CMAKE_CURRENT_SOURCE_DIR} -DBINARY_DIR=${CMAKE_CURRENT_BINARY_DIR} -P ${CMAKE_CURRENT_SOURCE_DIR}/cmake/InputRevision.cmake
    )
  endif (NOT DEFINED WL_VERSION)
  
 @@ -244,7 +244,7 @@ add_custom_target(_run_all_tests ALL
  
  install (
    FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
 -  DESTINATION ${WL_INSTALL_BASEDIR}
 +  DESTINATION ${WL_INSTALL_DOCDIR}
    CONFIGURATIONS Debug;Release
    COMPONENT CoreVersionFile
  )
 @@ -294,7 +294,7 @@ install(
      COPYING
      CREDITS
      ChangeLog
 -  DESTINATION ${WL_INSTALL_BASEDIR}
 +  DESTINATION ${WL_INSTALL_DOCDIR}
    CONFIGURATIONS Debug;Release
    COMPONENT CoreLicenseFiles
  )
 @@ -302,7 +302,7 @@ install(
  install(
    DIRECTORY
      doc
 -  DESTINATION ${WL_INSTALL_BASEDIR}
 +  DESTINATION ${WL_INSTALL_DOCDIR}
    CONFIGURATIONS Debug
    COMPONENT DocFiles
    PATTERN "CMakeLists.txt" EXCLUDE