Attachment #182369 for bug #216457




# $FreeBSD$

PORTNAME=	widelands
DISTVERSION=	build19
PORTREVISION=	10
CATEGORIES=	games
MASTER_SITES=	https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
		http://mirror.amdmi3.ru/distfiles/
DISTNAME=	${PORTNAME}-${DISTVERSION}-src


BUILD_DEPENDS=	${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs

USES=		cmake:outsource compiler:c++11-lib execinfo gettext \
		lua:52 tar:bzip2 python:build
CMAKE_ARGS=	-DWL_INSTALL_BASEDIR="${PREFIX}" \
		-DWL_INSTALL_DATADIR="${DATADIR}" \
		-DWL_INSTALL_DOCDIR="${DOCSDIR}" \
		-DWL_INSTALL_BINDIR="bin" \
		-DWL_VERSION="${DISTVERSION}" \
		-DWL_OPTIMIZE_FLAGS=""
USE_GL=		glew
USE_SDL=	sdl2 mixer2 image2 net2 ttf2

PLIST_FILES=	bin/widelands
PORTDATA=	*
PORTDOCS=	*
		%%DATADIR%%/maps/Swamp\ Monks.wmf/scripting

DESKTOP_ENTRIES="Widelands" \
		"" \

Lines 1-2 Link Here

(-)distinfo (-2 / +3 lines)
1	SHA256 (widelands-build18-src.tar.bz2) = 6dffd9178f93ff7a9c3c0c9b31b7d3b8eb060c79fbd98901e6311837390b7de3	1	TIMESTAMP = 1494019260
2	SIZE (widelands-build18-src.tar.bz2) = 183443325	2	SHA256 (widelands-build19-src.tar.bz2) = e511f9d26828a2b71b64cdfc6674e6e847543b2da73961ab882acca36c7c01a6
		3	SIZE (widelands-build19-src.tar.bz2) = 181609391




--- 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")
@@ -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
+set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3" CACHE STRING "")
 
 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

Lines 1-10 Link Here

(-)files/patch-src-i18n.cc (-10 lines)
1	--- src/i18n.cc.orig 2012-04-23 13:46:49.000000000 +0400
2	+++ src/i18n.cc 2013-09-13 20:18:48.792226136 +0400
3	@@ -27,6 +27,7 @@
4
5	#include <cstdlib>
6	#include <utility>
7	+#include <clocale>
8
9	#if __APPLE__ && LIBINTL_VERSION >= 0x001201
10	// for older libintl versions, setlocale is just fine




bin/widelands
bin/wl_map_info
bin/wl_map_object_info
bin/wl_render_richtext
@dir %%DATADIR%%/maps/Archipelago_Sea.wmf/scripting
@dir %%DATADIR%%/maps/Atoll.wmf/scripting
@dir %%DATADIR%%/maps/Calvisson.wmf/scripting
@dir %%DATADIR%%/maps/Checkmate.wmf/scripting
@dir %%DATADIR%%/maps/Comet_Island_v2.wmf/scripting
@dir %%DATADIR%%/maps/Crater.wmf/scripting
@dir %%DATADIR%%/maps/Crossing_the_Horizon.wmf/scripting
@dir %%DATADIR%%/maps/Desert_Tournament.wmf/scripting
@dir %%DATADIR%%/maps/Dolomites_v2.wmf/scripting
@dir %%DATADIR%%/maps/Elven_Forests.wmf/scripting
@dir %%DATADIR%%/maps/Fellowships_v2.wmf/scripting
@dir %%DATADIR%%/maps/Finnish_Lakes.wmf/scripting
@dir %%DATADIR%%/maps/Firegames.wmf/scripting
@dir %%DATADIR%%/maps/Four_Castles.wmf/scripting
@dir %%DATADIR%%/maps/Four_Mountains.wmf/scripting
@dir %%DATADIR%%/maps/Full_Moon_v2.wmf/scripting
@dir %%DATADIR%%/maps/Glacier_Lake_v2.wmf/scripting
@dir %%DATADIR%%/maps/Golden_Peninsula.wmf/scripting
@dir %%DATADIR%%/maps/Ice_wars.wmf/scripting
@dir %%DATADIR%%/maps/Impact.wmf/scripting
@dir %%DATADIR%%/maps/Islands_at_War.wmf/scripting
@dir %%DATADIR%%/maps/Kings_and_Queens_v2.wmf/scripting
@dir %%DATADIR%%/maps/Lake_of_Tranquility.wmf/scripting
@dir %%DATADIR%%/maps/Last_Bastion_v2.wmf/scripting
@dir %%DATADIR%%/maps/Last_Survivors.wmf/scripting
@dir %%DATADIR%%/maps/Mystical_Maze.wmf/scripting
@dir %%DATADIR%%/maps/Rendez-Vous.wmf/scripting
@dir %%DATADIR%%/maps/River_Explorers.wmf/scripting
@dir %%DATADIR%%/maps/Riverlands.wmf/scripting
@dir %%DATADIR%%/maps/Sun_of_Fire.wmf/scripting
@dir %%DATADIR%%/maps/Swamp_Island.wmf/scripting
@dir %%DATADIR%%/maps/Swamp_Monks.wmf/scripting
@dir %%DATADIR%%/maps/The_Big_Lake.wmf/scripting
@dir %%DATADIR%%/maps/The_Far_North.wmf/scripting
@dir %%DATADIR%%/maps/The_Long_Way.wmf/scripting
@dir %%DATADIR%%/maps/The_Nile_v2.wmf/scripting
@dir %%DATADIR%%/maps/The_Oasis_Triangle.wmf/scripting
@dir %%DATADIR%%/maps/The_Pass_Through_the_Mountains.wmf/scripting
@dir %%DATADIR%%/maps/The_Thaw.wmf/scripting
@dir %%DATADIR%%/maps/Three_Warriors.wmf/scripting
@dir %%DATADIR%%/maps/Together_We're_Strong.wmf/scripting
@dir %%DATADIR%%/maps/Twin_Lagoons_v2.wmf/scripting
@dir %%DATADIR%%/maps/Twinkling_Waves.wmf/scripting
@dir %%DATADIR%%/maps/Two_Frontiers.wmf/scripting
@dir %%DATADIR%%/maps/Volcanic_Winter.wmf/scripting
@dir %%DATADIR%%/maps/Wideworld.wmf/scripting
@dir %%DATADIR%%/maps/Wisent_Valley.wmf/scripting

Return to bug 216457

Lines 2-11 Link Here

(-)Makefile (-11 / +9 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= widelands	4	PORTNAME= widelands
5	DISTVERSION= build18	5	DISTVERSION= build19
6	PORTREVISION= 10
7	CATEGORIES= games	6	CATEGORIES= games
8	MASTER_SITES= https://launchpadlibrarian.net/167260749/ \	7	MASTER_SITES= https://launchpad.net/widelands/${DISTVERSION}/${DISTVERSION}/+download/ \
9	http://mirror.amdmi3.ru/distfiles/	8	http://mirror.amdmi3.ru/distfiles/
10	DISTNAME= ${PORTNAME}-${DISTVERSION}-src	9	DISTNAME= ${PORTNAME}-${DISTVERSION}-src
11		10
Lines 19-37 Link Here
19	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs	18	BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:devel/boost-libs
20		19
21	USES= cmake:outsource compiler:c++11-lib execinfo gettext \	20	USES= cmake:outsource compiler:c++11-lib execinfo gettext \
22	lua:51 tar:bzip2 python:build	21	lua:52 tar:bzip2 python:build
23	CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFIX}" \	22	CMAKE_ARGS= -DWL_INSTALL_BASEDIR="${PREFIX}" \
24	-DWL_INSTALL_DATADIR="share/widelands" \	23	-DWL_INSTALL_DATADIR="${DATADIR}" \
		24	-DWL_INSTALL_DOCDIR="${DOCSDIR}" \
25	-DWL_INSTALL_BINDIR="bin" \	25	-DWL_INSTALL_BINDIR="bin" \
26	-DWL_VERSION="${DISTVERSION}" \	26	-DWL_VERSION="${DISTVERSION}" \
27	-DWL_COMPILERFLAG_OPTIMIZATIONS=""	27	-DWL_OPTIMIZE_FLAGS=""
28	USE_GL= glew	28	USE_GL= glew
29	USE_SDL= sdl mixer image net ttf gfx	29	USE_SDL= sdl2 mixer2 image2 net2 ttf2
30		30
31	PLIST_FILES= bin/widelands
32	PORTDATA= *	31	PORTDATA= *
33	PLIST_DIRS= %%DATADIR%%/maps/Desert\ Tournament.wmf/scripting \	32	PORTDOCS= *
34	%%DATADIR%%/maps/Swamp\ Monks.wmf/scripting
35		33
36	DESKTOP_ENTRIES="Widelands" \	34	DESKTOP_ENTRIES="Widelands" \
37	"" \	35	"" \

Lines 1-11 Link Here

(-)files/patch-CMakeLists.txt (-9 / +45 lines)
1	--- CMakeLists.txt.orig 2014-02-22 13:06:51.000000000 +0400	1	--- CMakeLists.txt.orig 2016-11-10 07:28:01 UTC
2	+++ CMakeLists.txt 2014-02-26 18:16:19.484090644 +0400	2	+++ CMakeLists.txt
3	@@ -254,7 +254,7 @@	3	@@ -93,7 +93,7 @@ endif (NOT CMAKE_BUILD_TYPE OR CMAKE_BUILD_TYPE STREQU
4	# CMAKE only defines "-g", but we need -DDEBUG also, and we need -DNOPARACHUTE (for SDL) in Debug	4	if(CMAKE_BUILD_TYPE STREQUAL "Debug")
5	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)	5	set(WL_DEBUG_FLAGS "-g -DDEBUG")
		6	elseif(CMAKE_BUILD_TYPE STREQUAL "Release")
		7	- set(WL_OPTIMIZE_FLAGS "-O3")
		8	+ set(WL_OPTIMIZE_FLAGS "-O3" CACHE STRING "")
		9	set(WL_DEBUG_FLAGS "-DNDEBUG -DNOPARACHUTE")
		10	elseif(CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo")
		11	set(WL_OPTIMIZE_FLAGS "-O3")
		12	@@ -225,7 +225,7 @@ if (NOT DEFINED WL_VERSION)
		13	else (NOT DEFINED WL_VERSION)
		14	add_custom_target (
		15	InputRevision ALL
		16	- 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
		17	+ 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
		18	)
		19	endif (NOT DEFINED WL_VERSION)
6		20
7	-set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3")	21	@@ -244,7 +244,7 @@ add_custom_target(_run_all_tests ALL
8	+set (WL_COMPILERFLAG_OPTIMIZATIONS "-O3" CACHE STRING "")
9		22
10	#This can be removed if no one uses gcc 4.5.1 or 4.5.2 any more	23	install (
11	IF (CMAKE_COMPILER_IS_GNUCXX)	24	FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
		25	- DESTINATION ${WL_INSTALL_BASEDIR}
		26	+ DESTINATION ${WL_INSTALL_DOCDIR}
		27	CONFIGURATIONS Debug;Release
		28	COMPONENT CoreVersionFile
		29	)
		30	@@ -294,7 +294,7 @@ install(
		31	COPYING
		32	CREDITS
		33	ChangeLog
		34	- DESTINATION ${WL_INSTALL_BASEDIR}
		35	+ DESTINATION ${WL_INSTALL_DOCDIR}
		36	CONFIGURATIONS Debug;Release
		37	COMPONENT CoreLicenseFiles
		38	)
		39	@@ -302,7 +302,7 @@ install(
		40	install(
		41	DIRECTORY
		42	doc
		43	- DESTINATION ${WL_INSTALL_BASEDIR}
		44	+ DESTINATION ${WL_INSTALL_DOCDIR}
		45	CONFIGURATIONS Debug
		46	COMPONENT DocFiles
		47	PATTERN "CMakeLists.txt" EXCLUDE

Line 0 Link Here

(-)pkg-plist (+51 lines)
	1	bin/widelands
	2	bin/wl_map_info
	3	bin/wl_map_object_info
	4	bin/wl_render_richtext
	5	@dir %%DATADIR%%/maps/Archipelago_Sea.wmf/scripting
	6	@dir %%DATADIR%%/maps/Atoll.wmf/scripting
	7	@dir %%DATADIR%%/maps/Calvisson.wmf/scripting
	8	@dir %%DATADIR%%/maps/Checkmate.wmf/scripting
	9	@dir %%DATADIR%%/maps/Comet_Island_v2.wmf/scripting
	10	@dir %%DATADIR%%/maps/Crater.wmf/scripting
	11	@dir %%DATADIR%%/maps/Crossing_the_Horizon.wmf/scripting
	12	@dir %%DATADIR%%/maps/Desert_Tournament.wmf/scripting
	13	@dir %%DATADIR%%/maps/Dolomites_v2.wmf/scripting
	14	@dir %%DATADIR%%/maps/Elven_Forests.wmf/scripting
	15	@dir %%DATADIR%%/maps/Fellowships_v2.wmf/scripting
	16	@dir %%DATADIR%%/maps/Finnish_Lakes.wmf/scripting
	17	@dir %%DATADIR%%/maps/Firegames.wmf/scripting
	18	@dir %%DATADIR%%/maps/Four_Castles.wmf/scripting
	19	@dir %%DATADIR%%/maps/Four_Mountains.wmf/scripting
	20	@dir %%DATADIR%%/maps/Full_Moon_v2.wmf/scripting
	21	@dir %%DATADIR%%/maps/Glacier_Lake_v2.wmf/scripting
	22	@dir %%DATADIR%%/maps/Golden_Peninsula.wmf/scripting
	23	@dir %%DATADIR%%/maps/Ice_wars.wmf/scripting
	24	@dir %%DATADIR%%/maps/Impact.wmf/scripting
	25	@dir %%DATADIR%%/maps/Islands_at_War.wmf/scripting
	26	@dir %%DATADIR%%/maps/Kings_and_Queens_v2.wmf/scripting
	27	@dir %%DATADIR%%/maps/Lake_of_Tranquility.wmf/scripting
	28	@dir %%DATADIR%%/maps/Last_Bastion_v2.wmf/scripting
	29	@dir %%DATADIR%%/maps/Last_Survivors.wmf/scripting
	30	@dir %%DATADIR%%/maps/Mystical_Maze.wmf/scripting
	31	@dir %%DATADIR%%/maps/Rendez-Vous.wmf/scripting
	32	@dir %%DATADIR%%/maps/River_Explorers.wmf/scripting
	33	@dir %%DATADIR%%/maps/Riverlands.wmf/scripting
	34	@dir %%DATADIR%%/maps/Sun_of_Fire.wmf/scripting
	35	@dir %%DATADIR%%/maps/Swamp_Island.wmf/scripting
	36	@dir %%DATADIR%%/maps/Swamp_Monks.wmf/scripting
	37	@dir %%DATADIR%%/maps/The_Big_Lake.wmf/scripting
	38	@dir %%DATADIR%%/maps/The_Far_North.wmf/scripting
	39	@dir %%DATADIR%%/maps/The_Long_Way.wmf/scripting
	40	@dir %%DATADIR%%/maps/The_Nile_v2.wmf/scripting
	41	@dir %%DATADIR%%/maps/The_Oasis_Triangle.wmf/scripting
	42	@dir %%DATADIR%%/maps/The_Pass_Through_the_Mountains.wmf/scripting
	43	@dir %%DATADIR%%/maps/The_Thaw.wmf/scripting
	44	@dir %%DATADIR%%/maps/Three_Warriors.wmf/scripting
	45	@dir %%DATADIR%%/maps/Together_We're_Strong.wmf/scripting
	46	@dir %%DATADIR%%/maps/Twin_Lagoons_v2.wmf/scripting
	47	@dir %%DATADIR%%/maps/Twinkling_Waves.wmf/scripting
	48	@dir %%DATADIR%%/maps/Two_Frontiers.wmf/scripting
	49	@dir %%DATADIR%%/maps/Volcanic_Winter.wmf/scripting
	50	@dir %%DATADIR%%/maps/Wideworld.wmf/scripting
	51	@dir %%DATADIR%%/maps/Wisent_Valley.wmf/scripting