Page MenuHomeFreeBSD

D16995.id47811.diff
No OneTemporary

D16995.id47811.diff

Index: games/barony/Makefile
===================================================================
--- games/barony/Makefile
+++ games/barony/Makefile
@@ -2,7 +2,7 @@
PORTNAME= barony
DISTVERSIONPREFIX= v
-DISTVERSION= 3.1.4
+DISTVERSION= 3.2.1
CATEGORIES= games
MAINTAINER= devnexen@gmail.com
@@ -13,7 +13,8 @@
LIB_DEPENDS= libogg.so:audio/libogg \
libpng.so:graphics/png \
- libvorbisfile.so:audio/libvorbis
+ libvorbisfile.so:audio/libvorbis \
+ libphysfs.so:devel/physfs-devel
USES= cmake compiler:c++11-lib openal localbase:ldflags pkgconfig
USE_GITHUB= yes
@@ -27,16 +28,11 @@
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 <bsd.port.mk>
Index: games/barony/distinfo
===================================================================
--- games/barony/distinfo
+++ games/barony/distinfo
@@ -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
Index: games/barony/files/barony.sh.in
===================================================================
--- games/barony/files/barony.sh.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-# Temporary solution until the next version
-mkdir -p ~/.barony
-cd ~/.barony || { echo "Can't cd into ~/.barony" >&2; exit 1; }
-exec %%PREFIX%%/libexec/barony "$@"
Index: games/barony/files/patch-src_menu.cpp
===================================================================
--- /dev/null
+++ games/barony/files/patch-src_menu.cpp
@@ -0,0 +1,11 @@
+--- src/menu.cpp.orig 2018-09-08 11:02:18.142571000 +0100
++++ src/menu.cpp 2018-09-08 11:26:28.106122000 +0100
+@@ -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) != 0 && line.compare("./") != 0 ) // don't unmount the base ./ directory
+ {
+ if ( PHYSFS_unmount(*i) == 0 )
+ {
Index: games/barony/files/pkg-message.in
===================================================================
--- games/barony/files/pkg-message.in
+++ games/barony/files/pkg-message.in
@@ -3,7 +3,7 @@
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 @@
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 {} \;

File Metadata

Mime Type
text/plain
Expires
Wed, Oct 8, 11:41 PM (22 h, 31 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
23477115
Default Alt Text
D16995.id47811.diff (3 KB)

Event Timeline