From owner-svn-ports-head@FreeBSD.ORG Thu Sep 11 18:08:38 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id EDAB3174; Thu, 11 Sep 2014 18:08:38 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 D82DDF20; Thu, 11 Sep 2014 18:08:38 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s8BI8cGs069019; Thu, 11 Sep 2014 18:08:38 GMT (envelope-from amdmi3@FreeBSD.org) Received: (from amdmi3@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s8BI8cYt069010; Thu, 11 Sep 2014 18:08:38 GMT (envelope-from amdmi3@FreeBSD.org) Message-Id: <201409111808.s8BI8cYt069010@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: amdmi3 set sender to amdmi3@FreeBSD.org using -f From: Dmitry Marakasov Date: Thu, 11 Sep 2014 18:08:38 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r367960 - in head/games/openxcom: . 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.18-1 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, 11 Sep 2014 18:08:39 -0000 Author: amdmi3 Date: Thu Sep 11 18:08:37 2014 New Revision: 367960 URL: http://svnweb.freebsd.org/changeset/ports/367960 QAT: https://qat.redports.org/buildarchive/r367960/ Log: - Update to 1.0 PR: 145239 Submitted by: madpilot@FreeBSD.org Added: head/games/openxcom/files/patch-src__Engine__RNG.cpp (contents, props changed) Modified: head/games/openxcom/Makefile head/games/openxcom/distinfo head/games/openxcom/files/pkg-message.in Modified: head/games/openxcom/Makefile ============================================================================== --- head/games/openxcom/Makefile Thu Sep 11 17:55:50 2014 (r367959) +++ head/games/openxcom/Makefile Thu Sep 11 18:08:37 2014 (r367960) @@ -2,25 +2,24 @@ # $FreeBSD$ PORTNAME= openxcom -PORTVERSION= 0.9.0 -PORTREVISION= 4 +PORTVERSION= 1.0.0 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Open-source reimplementation of the original X-Com LICENSE= GPLv3 -LICENSE_FILE= ${WRKSRC}/COPYING +LICENSE_FILE= ${WRKSRC}/LICENSE.txt LIB_DEPENDS= libyaml-cpp.so:${PORTSDIR}/devel/yaml-cpp USE_GITHUB= yes GH_ACCOUNT= SupSuper GH_PROJECT= OpenXcom -GH_TAGNAME= v0.9 -GH_COMMIT= 5c8b540 +GH_TAGNAME= v1.0 +GH_COMMIT= b396c74 -USES= gmake pkgconfig +USES= compiler:c++11-lang gmake pkgconfig USE_SDL= sdl mixer image gfx USE_GL= gl @@ -37,15 +36,7 @@ PORTDATA= * OPTIONS_DEFINE= DOCS -.include - -.if ${OSVERSION} < 1000000 -USE_GCC= yes -.endif - post-patch: - @${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/src/pch.h \ - ${WRKSRC}/src/Engine/Surface.cpp @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|' ${WRKSRC}/README.txt \ ${WRKSRC}/src/Engine/CrossPlatform.cpp @@ -55,6 +46,6 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/res/linux/icons/openxcom.svg ${STAGEDIR}${PREFIX}/share/pixmaps/ cd ${WRKSRC}/bin && ${COPYTREE_SHARE} data ${STAGEDIR}${DATADIR}/ ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}/ + ${INSTALL_DATA} ${WRKSRC}/README.txt ${WRKSRC}/CHANGELOG.txt ${STAGEDIR}${DOCSDIR}/ .include Modified: head/games/openxcom/distinfo ============================================================================== --- head/games/openxcom/distinfo Thu Sep 11 17:55:50 2014 (r367959) +++ head/games/openxcom/distinfo Thu Sep 11 18:08:37 2014 (r367960) @@ -1,2 +1,2 @@ -SHA256 (openxcom-0.9.0.tar.gz) = 340ff7292baa9a2b7ce4b244cc6dc0200c1d3b807a59087ef9827bba5c135634 -SIZE (openxcom-0.9.0.tar.gz) = 1540556 +SHA256 (openxcom-1.0.0.tar.gz) = d0bbc9fcd1671ad952c1b825a137a67ac5ed339827cedb660e46678c9a369557 +SIZE (openxcom-1.0.0.tar.gz) = 2069030 Added: head/games/openxcom/files/patch-src__Engine__RNG.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/openxcom/files/patch-src__Engine__RNG.cpp Thu Sep 11 18:08:37 2014 (r367960) @@ -0,0 +1,19 @@ +--- src/Engine/RNG.cpp.orig 2014-06-13 23:14:43.000000000 +0400 ++++ src/Engine/RNG.cpp 2014-09-11 18:52:08.000000000 +0400 +@@ -17,6 +17,7 @@ + * along with OpenXcom. If not, see . + */ + #include "RNG.h" ++#include + #include + #include + +@@ -86,7 +87,7 @@ + double generate(double min, double max) + { + double num = next(); +- return (double)(num / ((double)UINT64_MAX / (max - min)) + min); ++ return (double)(num / ((double)std::numeric_limits::max() / (max - min)) + min); + } + + /** Modified: head/games/openxcom/files/pkg-message.in ============================================================================== --- head/games/openxcom/files/pkg-message.in Thu Sep 11 17:55:50 2014 (r367959) +++ head/games/openxcom/files/pkg-message.in Thu Sep 11 18:08:37 2014 (r367960) @@ -2,13 +2,14 @@ OpenXcom requires original UFO: Enemy Unknown / X-Com: UFO Defense data files. Please copy all subfolders from original game into -%%PREFIX%%/share/openxcom/data directory. +%%DATADIR%%/data directory. -Also note that if you get "GMDEFENT NOT FOUND" message, you need -to patch your UFO to at least version 1.4. See +Also note that if you get messages like "GMDEFENT NOT FOUND" or +"INVALID CHRYS.PCK", you need to patch your UFO date to the latest +version. See section `Data Patch' of -http://openxcom.org/forum/index.php?topic=1129.0 + http://openxcom.org/index.php/downloads-extras/ -for reference. +for details. ==========================================================================