Date: Sat, 1 Dec 2012 09:41:54 +0000 (UTC) From: Dmitry Marakasov <amdmi3@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r308070 - in head/games/widelands: . files Message-ID: <201212010941.qB19fsQV076848@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: amdmi3 Date: Sat Dec 1 09:41:54 2012 New Revision: 308070 URL: http://svnweb.freebsd.org/changeset/ports/308070 Log: - Update to build17 - Trim header Feature safe: yes Deleted: head/games/widelands/files/patch-doc-CMakeLists.txt head/games/widelands/files/patch-src-graphic-SDL_mng.cc head/games/widelands/files/patch-src-io-filesystem-disk_filesystem.cc head/games/widelands/files/patch-src-wlapplication.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 Sat Dec 1 09:40:37 2012 (r308069) +++ head/games/widelands/Makefile Sat Dec 1 09:41:54 2012 (r308070) @@ -1,24 +1,19 @@ -# Ports collection makefile for: widelands -# Date created: 8 April 2007 -# Whom: Bartosz Fabianowski <freebsd@chillt.de> -# +# Created by: Bartosz Fabianowski <freebsd@chillt.de> # $FreeBSD$ -# PORTNAME= widelands -DISTVERSION= build16 -PORTREVISION= 3 +DISTVERSION= build17 CATEGORIES= games -MASTER_SITES= http://launchpadlibrarian.net/69520494/ \ +MASTER_SITES= https://launchpadlibrarian.net/102893896/ \ http://mirror.amdmi3.ru/distfiles/ DISTNAME= ${PORTNAME}-${DISTVERSION}-src MAINTAINER= amdmi3@FreeBSD.org COMMENT= Realtime strategy game inspired by Settlers II -LIB_DEPENDS= ggzcore.9:${PORTSDIR}/games/ggz-client-libs \ - png15:${PORTSDIR}/graphics/png \ - GLEW.1:${PORTSDIR}/graphics/glew +LIB_DEPENDS= png15:${PORTSDIR}/graphics/png \ + GLEW.1:${PORTSDIR}/graphics/glew \ + execinfo:${PORTSDIR}/devel/libexecinfo BUILD_DEPENDS= ${LOCALBASE}/include/boost/shared_ptr.hpp:${PORTSDIR}/devel/boost-libs USE_BZIP2= yes @@ -32,7 +27,6 @@ CMAKE_ARGS= -DWL_INSTALL_PREFIX="${PREFI USE_LUA= 5.1+ USE_SDL= sdl mixer image net ttf gfx USE_PYTHON_BUILD=2.5+ -CFLAGS+= -I${LOCALBASE}/include/libpng15 MAKE_JOBS_SAFE= yes PLIST_FILES= bin/widelands @@ -45,8 +39,6 @@ DESKTOP_ENTRIES="Widelands" \ false post-patch: - @${REINPLACE_CMD} -e '/ifndef/ s|__APPLE__|__FreeBSD__|' \ - ${WRKSRC}/src/backtrace.cc @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' \ ${WRKSRC}/cmake/Modules/*.cmake Modified: head/games/widelands/distinfo ============================================================================== --- head/games/widelands/distinfo Sat Dec 1 09:40:37 2012 (r308069) +++ head/games/widelands/distinfo Sat Dec 1 09:41:54 2012 (r308070) @@ -1,2 +1,2 @@ -SHA256 (widelands-build16-src.tar.bz2) = d8db3c15c30314cb220c6d79d93d3d31e7bce2722c93d2c385d643c3c669625d -SIZE (widelands-build16-src.tar.bz2) = 137808494 +SHA256 (widelands-build17-src.tar.bz2) = be48b3b8f342a537b39a3aec2f7702250a6a47e427188ba3bece67d7d90f3cc5 +SIZE (widelands-build17-src.tar.bz2) = 175547379 Modified: head/games/widelands/files/patch-CMakeLists.txt ============================================================================== --- head/games/widelands/files/patch-CMakeLists.txt Sat Dec 1 09:40:37 2012 (r308069) +++ head/games/widelands/files/patch-CMakeLists.txt Sat Dec 1 09:41:54 2012 (r308070) @@ -1,11 +1,30 @@ ---- CMakeLists.txt.orig 2011-04-15 22:40:26.000000000 +0400 -+++ CMakeLists.txt 2011-05-25 01:12:54.000000000 +0400 -@@ -204,7 +204,7 @@ - set (CMAKE_CXX_FLAGS_DEBUG "-g -DDEBUG -DNOPARACHUTE${WL_COMPILERFLAG_OLDSTYLECAST}${WL_COMPILERFLAG_GENERICWARNINGS}${WL_COMPILERFLAG_EXTRAWARNINGS}${WL_COMPILERFLAG_STRICT}" CACHE STRING "Set by widelands CMakeLists.txt" FORCE) +--- 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}) - # CMAKE defines "-O3 -DNDEBUG", but we better say -O2 (see gcc manual) --set (CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE) -+set (CMAKE_CXX_FLAGS_RELEASE "-DNDEBUG" CACHE STRING "Set by widelands CMakeLists.txt" FORCE) +@@ -391,10 +389,10 @@ + find_package(ZLIB REQUIRED) + include_directories(${ZLIB_INCLUDE_DIR}) - #If building with MSVC, then check for 3rdparty libs - if (DEFINED MSVC) +-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})
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212010941.qB19fsQV076848>