svn commit: r349474 - in head/games/widelands: . files

[Dmitry Marakasov]

Author: amdmi3
Date: Fri Mar 28 23:36:14 2014
New Revision: 349474
URL: http://svnweb.freebsd.org/changeset/ports/349474
QAT: https://qat.redports.org/buildarchive/r349474/

Log:
  - Update to build18

Deleted:
  head/games/widelands/files/patch-src-CMakeLists.txt
  head/games/widelands/files/patch-src-io-filesystem-disk__filesystem.cc
  head/games/widelands/files/patch-src-journal__exceptions.h
  head/games/widelands/files/patch-src-main.cc
  head/games/widelands/files/patch-src-writeHTML.cc
Modified:
  head/games/widelands/Makefile
  head/games/widelands/distinfo
  head/games/widelands/files/patch-CMakeLists.txt

Modified: head/games/widelands/Makefile
==============================================================================
--- head/games/widelands/Makefile	Fri Mar 28 23:35:31 2014	(r349473)
+++ head/games/widelands/Makefile	Fri Mar 28 23:36:14 2014	(r349474)
@@ -2,10 +2,9 @@
 # $FreeBSD$
 
 PORTNAME=	widelands
-DISTVERSION=	build17
-PORTREVISION=	2
+DISTVERSION=	build18
 CATEGORIES=	games
-MASTER_SITES=	https://launchpadlibrarian.net/102893896/ \
+MASTER_SITES=	https://launchpadlibrarian.net/167260749/ \
 		http://mirror.amdmi3.ru/distfiles/
 DISTNAME=	${PORTNAME}-${DISTVERSION}-src
 
@@ -17,13 +16,13 @@ LIB_DEPENDS=	libpng.so:${PORTSDIR}/graph
 		libexecinfo.so:${PORTSDIR}/devel/libexecinfo
 BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs
 
-USE_BZIP2=	yes
-USES=		cmake:outsource gettext
+USES=		tar:bzip2 cmake:outsource gettext compiler:c++11-lib
 CMAKE_ARGS=	-DWL_INSTALL_PREFIX="${PREFIX}" \
 		-DWL_INSTALL_DATADIR="share/widelands" \
 		-DWL_INSTALL_BINDIR="bin" \
-		-DWL_VERSION="${DISTVERSION}"
-USE_LUA=	5.1+
+		-DWL_VERSION="${DISTVERSION}" \
+		-DWL_COMPILERFLAG_OPTIMIZATIONS=""
+USE_LUA=	5.1
 USE_SDL=	sdl mixer image net ttf gfx
 USE_PYTHON_BUILD=yes
 
@@ -31,11 +30,11 @@ PLIST_FILES=	bin/widelands
 PORTDATA=	*
 
 DESKTOP_ENTRIES="Widelands" \
-		"Realtime strategy game inspired by Settlers II" \
+		"" \
 		"${DATADIR}/pics/wl-ico-64.png" \
 		"widelands" \
 		"Game;StrategyGame;" \
-		false
+		""
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \

Modified: head/games/widelands/distinfo
==============================================================================
--- head/games/widelands/distinfo	Fri Mar 28 23:35:31 2014	(r349473)
+++ head/games/widelands/distinfo	Fri Mar 28 23:36:14 2014	(r349474)
@@ -1,2 +1,2 @@
-SHA256 (widelands-build17-src.tar.bz2) = be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5
-SIZE (widelands-build17-src.tar.bz2) = 175547379
+SHA256 (widelands-build18-src.tar.bz2) = 6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3
+SIZE (widelands-build18-src.tar.bz2) = 183443325

Modified: head/games/widelands/files/patch-CMakeLists.txt
==============================================================================
--- head/games/widelands/files/patch-CMakeLists.txt	Fri Mar 28 23:35:31 2014	(r349473)
+++ head/games/widelands/files/patch-CMakeLists.txt	Fri Mar 28 23:36:14 2014	(r349474)
@@ -1,30 +1,11 @@
---- CMakeLists.txt.orig	2012-04-23 13:46:49.000000000 +0400
-+++ CMakeLists.txt	2012-11-30 17:28:03.093935459 +0400
-@@ -219,12 +219,10 @@
-     )
-     STRING(REGEX REPLACE ".*(4)\\.(5)\\.([0-9]).*" "\\1.\\2.\\3" WLBUILD_COMPILERVERSION_REP ${WLBUILD_COMPILERVERSION})
-     IF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
--        message("Detected gcc ${WLBUILD_COMPILERVERSION_REP}")
--        message("Suffering from gcc bug, disabling -O3")
--        set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-     ELSE (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
-         #This line is the default and should be preserved.
--        set (CMAKE_CXX_FLAGS_RELEASE "-O3 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-+        set (CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
-     ENDIF (WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.1" OR WLBUILD_COMPILERVERSION_REP STREQUAL "4.5.2")
- ENDIF (${CMAKE_COMPILER_IS_GNUCXX})
+--- CMakeLists.txt.orig	2014-02-22 13:06:51.000000000 +0400
++++ CMakeLists.txt	2014-02-26 18:16:19.484090644 +0400
+@@ -254,7 +254,7 @@
+ # CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug
+ set (CMAKE_CXX_FLAGS_DEBUG "${WL_COMPILERFLAG_CXXSTD} -g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_GCCWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE)
  
-@@ -391,10 +389,10 @@
- find_package(ZLIB REQUIRED)
- include_directories(${ZLIB_INCLUDE_DIR})
+-set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3")
++set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3" CACHE STRING "")
  
--if (APPLE OR WIN32)
-+if (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
-   find_package(intl REQUIRED)
-   include_directories(${INTL_INCLUDE_DIR})
--endif (APPLE OR WIN32)
-+endif (APPLE OR WIN32 OR CMAKE_SYSTEM_NAME MATCHES "FreeBSD")
- 
- find_package(SDL REQUIRED)
- include_directories(${SDL_INCLUDE_DIR})
+ #This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more
+ IF (CMAKE_COMPILER_IS_GNUCXX)