From owner-svn-ports-head@freebsd.org Thu Nov 5 20:34:19 2015 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5B475A27B79; Thu, 5 Nov 2015 20:34:19 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 0D81F18BE; Thu, 5 Nov 2015 20:34:18 +0000 (UTC) (envelope-from amdmi3@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id tA5KYIeB021179; Thu, 5 Nov 2015 20:34:18 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id tA5KYHij021176; Thu, 5 Nov 2015 20:34:17 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201511052034.tA5KYHij021176@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 5 Nov 2015 20:34:17 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r400866 - in head/games/wesnoth: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 05 Nov 2015 20:34:19 -0000 Author: amdmi3 Date: Thu Nov 5 20:34:17 2015 New Revision: 400866 URL: https://svnweb.freebsd.org/changeset/ports/400866 Log: - Fix build with TEST enabled Approved by: portmgr blanket Added: head/games/wesnoth/files/ head/games/wesnoth/files/patch-src_tests_test__util.cpp (contents, props changed) Modified: head/games/wesnoth/Makefile head/games/wesnoth/pkg-plist Modified: head/games/wesnoth/Makefile ============================================================================== --- head/games/wesnoth/Makefile Thu Nov 5 20:34:14 2015 (r400865) +++ head/games/wesnoth/Makefile Thu Nov 5 20:34:17 2015 (r400866) @@ -69,7 +69,6 @@ RAWSOCKETS_CFLAGS=-DNETWORK_USE_RAW_SOCK SERVER_DESC= Server SERVER_CMAKE_OFF=-DENABLE_SERVER=off TEST_CMAKE_ON= -DENABLE_TESTS=on -TEST_BROKEN= Does not compile with TEST option enabled TOOLS_DESC= Extra tools for artists and translators TOOLS_CMAKE_ON= -DENABLE_TOOLS=on Added: head/games/wesnoth/files/patch-src_tests_test__util.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/wesnoth/files/patch-src_tests_test__util.cpp Thu Nov 5 20:34:17 2015 (r400866) @@ -0,0 +1,11 @@ +--- src/tests/test_util.cpp.orig 2015-06-25 23:08:11 UTC ++++ src/tests/test_util.cpp +@@ -89,7 +89,7 @@ BOOST_AUTO_TEST_CASE( test_count_leading + BOOST_CHECK( count_leading_ones(static_cast(0xFF)) == 8 ); + BOOST_CHECK( count_leading_ones(static_cast(0xFFFF)) == 16 ); + BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFF)) == 32 ); +- BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFFFFFFFFFF)) ++ BOOST_CHECK( count_leading_ones(static_cast(0xFFFFFFFFFFFFFFFFULL)) + == 64 ); + BOOST_CHECK( count_leading_ones(static_cast(0xF8)) == 5 ); + BOOST_CHECK( count_leading_ones(static_cast(54321)) == 2 ); Modified: head/games/wesnoth/pkg-plist ============================================================================== --- head/games/wesnoth/pkg-plist Thu Nov 5 20:34:14 2015 (r400865) +++ head/games/wesnoth/pkg-plist Thu Nov 5 20:34:17 2015 (r400866) @@ -13,7 +13,6 @@ bin/wesnoth %%TOOLS%%bin/schema_generator %%TOOLS%%bin/schema_validator %%TOOLS%%bin/wesmage -%%TEST%%bin/wesnoth_test %%SERVER%%bin/wesnothd share/applications/wesnoth.desktop share/applications/wesnoth_editor.desktop