Index: head/games/barony/Makefile
===================================================================
--- head/games/barony/Makefile	(revision 479600)
+++ head/games/barony/Makefile	(revision 479601)
@@ -1,43 +1,39 @@
 # $FreeBSD$
 
 PORTNAME=	barony
 DISTVERSIONPREFIX=	v
-DISTVERSION=	3.1.4
-PORTREVISION=	1
+DISTVERSION=	3.2.1
 CATEGORIES=	games
 
 MAINTAINER=	devnexen@gmail.com
 COMMENT=	3D roguelike game
 
 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
 USE_GL=		gl glu
 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 <bsd.port.mk>
Index: head/games/barony/distinfo
===================================================================
--- head/games/barony/distinfo	(revision 479600)
+++ head/games/barony/distinfo	(revision 479601)
@@ -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: head/games/barony/files/barony.sh.in
===================================================================
--- head/games/barony/files/barony.sh.in	(revision 479600)
+++ head/games/barony/files/barony.sh.in	(nonexistent)
@@ -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 "$@"

Property changes on: head/games/barony/files/barony.sh.in
___________________________________________________________________
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Deleted: svn:eol-style
## -1 +0,0 ##
-native
\ No newline at end of property
Deleted: svn:mime-type
## -1 +0,0 ##
-text/plain
\ No newline at end of property
Index: head/games/barony/files/patch-src_menu.cpp
===================================================================
--- head/games/barony/files/patch-src_menu.cpp	(nonexistent)
+++ head/games/barony/files/patch-src_menu.cpp	(revision 479601)
@@ -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 )
+ 			{

Property changes on: head/games/barony/files/patch-src_menu.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: head/games/barony/files/pkg-message.in
===================================================================
--- head/games/barony/files/pkg-message.in	(revision 479600)
+++ head/games/barony/files/pkg-message.in	(revision 479601)
@@ -1,25 +1,25 @@
 Barony requires the original game files from Barony: Blessed Edition
 (e.g. 3.1.x) to work properly.  These can come from the GOG.com
 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
 move the contents of this directory to the %%DATADIR%%
 directory for a global install.  You will also need to fix the
 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 {} \;
 
 As an alternative, the game assets can be placed into a personal folder
 of your choice and the game can be launched with the -datadir= option,
 for example:
 $ barony -datadir=$HOME/.barony
 
 You do not have to fix file permissions in this case.