From owner-svn-ports-head@freebsd.org Wed Sep 12 13:53:50 2018 Return-Path: Delivered-To: svn-ports-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 12A0E1094032; Wed, 12 Sep 2018 13:53:50 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id B0CC883694; Wed, 12 Sep 2018 13:53:49 +0000 (UTC) (envelope-from tobik@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 mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id ABBA22760D; Wed, 12 Sep 2018 13:53:49 +0000 (UTC) (envelope-from tobik@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w8CDrnRp091382; Wed, 12 Sep 2018 13:53:49 GMT (envelope-from tobik@FreeBSD.org) Received: (from tobik@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w8CDrnOD091379; Wed, 12 Sep 2018 13:53:49 GMT (envelope-from tobik@FreeBSD.org) Message-Id: <201809121353.w8CDrnOD091379@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: tobik set sender to tobik@FreeBSD.org using -f From: Tobias Kortkamp Date: Wed, 12 Sep 2018 13:53:49 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r479601 - in head/games/barony: . files X-SVN-Group: ports-head X-SVN-Commit-Author: tobik X-SVN-Commit-Paths: in head/games/barony: . files X-SVN-Commit-Revision: 479601 X-SVN-Commit-Repository: ports 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.27 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: Wed, 12 Sep 2018 13:53:50 -0000 Author: tobik Date: Wed Sep 12 13:53:48 2018 New Revision: 479601 URL: https://svnweb.freebsd.org/changeset/ports/479601 Log: games/barony: Update to 3.2.1 PR: 231109 Submitted by: maintainer Differential Revision: https://reviews.freebsd.org/D16995 Added: head/games/barony/files/patch-src_menu.cpp (contents, props changed) Deleted: head/games/barony/files/barony.sh.in Modified: head/games/barony/Makefile head/games/barony/distinfo head/games/barony/files/pkg-message.in Modified: head/games/barony/Makefile ============================================================================== --- head/games/barony/Makefile Wed Sep 12 13:19:44 2018 (r479600) +++ head/games/barony/Makefile Wed Sep 12 13:53:48 2018 (r479601) @@ -2,8 +2,7 @@ PORTNAME= barony DISTVERSIONPREFIX= v -DISTVERSION= 3.1.4 -PORTREVISION= 1 +DISTVERSION= 3.2.1 CATEGORIES= games MAINTAINER= devnexen@gmail.com @@ -13,10 +12,11 @@ LICENSE= GPLv3 LICENSE_FILE= ${WRKSRC}/GPL.3.0.txt LIB_DEPENDS= libogg.so:audio/libogg \ + libphysfs.so:devel/physfs-devel \ libpng.so:graphics/png \ libvorbisfile.so:audio/libvorbis -USES= cmake compiler:c++11-lib openal localbase:ldflags pkgconfig +USES= cmake compiler:c++11-lib dos2unix gl localbase:ldflags openal pkgconfig USE_GITHUB= yes GH_ACCOUNT= TurningWheel GH_PROJECT= Barony @@ -25,19 +25,15 @@ USE_SDL= sdl2 image2 net2 ttf2 CMAKE_ON= OPENAL_ENABLED DATA_DIR CMAKE_ARGS= -DEDITOR_EXE_NAME:STRING="barony-editor" +DOS2UNIX_FILES= src/menu.cpp LDFLAGS+= -Wl,--as-needed LLD_UNSAFE= yes # cf. PR 226980 -SUB_FILES= barony.sh pkg-message +SUB_FILES= pkg-message PLIST_FILES= bin/barony \ bin/barony-editor \ - libexec/barony \ ${DATADIR}/lang/en.ttf \ ${DATADIR}/lang/en.txt - -post-install: - ${MV} ${STAGEDIR}${PREFIX}/bin/barony ${STAGEDIR}${PREFIX}/libexec - ${INSTALL_SCRIPT} ${WRKDIR}/barony.sh ${STAGEDIR}${PREFIX}/bin/barony .include Modified: head/games/barony/distinfo ============================================================================== --- head/games/barony/distinfo Wed Sep 12 13:19:44 2018 (r479600) +++ head/games/barony/distinfo Wed Sep 12 13:53:48 2018 (r479601) @@ -1,3 +1,3 @@ -TIMESTAMP = 1524914514 -SHA256 (TurningWheel-Barony-v3.1.4_GH0.tar.gz) = bcf7522636a2dc21fdda47114f8d9c0eec78ca2c41613e896310e6110fbf04c4 -SIZE (TurningWheel-Barony-v3.1.4_GH0.tar.gz) = 53299453 +TIMESTAMP = 1535897000 +SHA256 (TurningWheel-Barony-v3.2.1_GH0.tar.gz) = db12b9226c6c839a9d7636c70d1ad65a03f78b4c42a3b89c9ab6dd6b3022131a +SIZE (TurningWheel-Barony-v3.2.1_GH0.tar.gz) = 53413992 Added: head/games/barony/files/patch-src_menu.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/games/barony/files/patch-src_menu.cpp Wed Sep 12 13:53:48 2018 (r479601) @@ -0,0 +1,11 @@ +--- src/menu.cpp.orig 2018-09-11 19:38:08 UTC ++++ src/menu.cpp +@@ -12266,7 +12266,7 @@ bool gamemodsClearAllMountedPaths() + for ( i = PHYSFS_getSearchPath(); *i != NULL; i++ ) + { + std::string line = *i; +- if ( line.compare(outputdir) != 0 && line.compare("./") != 0 ) // don't unmount the base ./ directory ++ if ( line.compare(outputdir) != 0 && line.compare(datadir) && line.compare("./") != 0 ) // don't unmount the base ./ directory + { + if ( PHYSFS_unmount(*i) == 0 ) + { Modified: head/games/barony/files/pkg-message.in ============================================================================== --- head/games/barony/files/pkg-message.in Wed Sep 12 13:19:44 2018 (r479600) +++ head/games/barony/files/pkg-message.in Wed Sep 12 13:53:48 2018 (r479601) @@ -3,7 +3,7 @@ Barony requires the original game files from Barony: B or the Steam versions of the game. If using the GOG.com version, you should download the Linux version -barony_cursed_edition_en_3_1_4_20342.sh and use the unzip command +barony_cursed_edition_en_3_2_1_23267.sh and use the unzip command line to extract the data. The files will be in a directory named data/noarch/game. You can @@ -13,7 +13,7 @@ permissions on the files. The easiest way to do this is to follow these steps: -$ unzip barony_cursed_edition_en_3_1_4_20342.sh +$ unzip barony_cursed_edition_en_3_2_1_23267.sh $ sudo cp -R data/noarch/game/* %%DATADIR%% $ sudo find %%DATADIR%% -type d ! -perm 755 -exec chmod 755 {} \;