Ah you beat me I was about to post a diff too :-) worked for me too.
On Fri, 28 Sep 2018 at 22:47, Solene Rapenne <sol...@perso.pw> wrote:
>
> Barony has a new version. This patch gets to latest version.
>
> barony-editor was missing devel/physfs
> I had to modify the patch on CMakeLists.txt.
> I updated pkg/README because asset file name has changed.
>
> Game works, I've been able to play a game and die at first level...
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/games/barony/Makefile,v
> retrieving revision 1.3
> diff -u -p -r1.3 Makefile
> --- Makefile 4 Sep 2018 12:46:12 -0000 1.3
> +++ Makefile 28 Sep 2018 21:44:44 -0000
> @@ -1,6 +1,6 @@
> # $OpenBSD: Makefile,v 1.3 2018/09/04 12:46:12 espie Exp $
>
> -V = 3.1.4
> +V = 3.2.2
> COMMENT = 3D, first person roguelike
> PKGNAME = ${DISTNAME:L}
> CATEGORIES = games x11
> @@ -8,7 +8,6 @@ CATEGORIES = games x11
> GH_ACCOUNT = TurningWheel
> GH_PROJECT = Barony
> GH_TAGNAME = v${V}
> -REVISION = 2
>
> HOMEPAGE = http://www.baronygame.com/
> MAINTAINER = David Carlier <devne...@gmail.com>
> @@ -17,7 +16,7 @@ MAINTAINER = David Carlier <devnexen@gma
> PERMIT_PACKAGE_CDROM = Yes
>
> WANTLIB += ${COMPILER_LIBCXX} GL GLU SDL2 SDL2_image SDL2_net
> -WANTLIB += SDL2_ttf c execinfo m ogg openal png vorbisfile
> +WANTLIB += SDL2_ttf c execinfo m ogg openal png vorbisfile physfs
>
> # C++11
> COMPILER = base-clang ports-gcc
> @@ -27,6 +26,7 @@ MODULES = devel/cmake
> LIB_DEPENDS = audio/libvorbis \
> audio/openal \
> devel/libexecinfo \
> + devel/physfs \
> devel/sdl2 \
> devel/sdl2-image \
> devel/sdl2-net \
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/games/barony/distinfo,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 distinfo
> --- distinfo 4 May 2018 22:30:08 -0000 1.1.1.1
> +++ distinfo 28 Sep 2018 21:44:44 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (Barony-3.1.4.tar.gz) = vPdSJjai3CH92kcRT42cDux4yixBYT6JYxDmEQ+/BMQ=
> -SIZE (Barony-3.1.4.tar.gz) = 53299453
> +SHA256 (Barony-3.2.2.tar.gz) = Kd2HLTnqX5rg20d6nYfF58EktoDBldjNckNiH+zW2OY=
> +SIZE (Barony-3.2.2.tar.gz) = 53418154
> Index: patches/patch-CMakeLists_txt
> ===================================================================
> RCS file: /cvs/ports/games/barony/patches/patch-CMakeLists_txt,v
> retrieving revision 1.1.1.1
> diff -u -p -r1.1.1.1 patch-CMakeLists_txt
> --- patches/patch-CMakeLists_txt 4 May 2018 22:30:08 -0000
> 1.1.1.1
> +++ patches/patch-CMakeLists_txt 28 Sep 2018 21:44:44 -0000
> @@ -26,7 +26,7 @@ Index: CMakeLists.txt
> endif()
> if (APPLE)
> set (Apple 1)
> -@@ -253,7 +253,7 @@ message("${CMAKE_CXX_FLAGS_DEBUG}")
> +@@ -255,7 +255,7 @@ message("${CMAKE_CXX_FLAGS_DEBUG}")
> message("Release flags: ")
> message("${CMAKE_C_FLAGS_RELEASE}")
> message("${CMAKE_CXX_FLAGS_RELEASE}")
> @@ -35,7 +35,7 @@ Index: CMakeLists.txt
> message("***************************")
>
>
> -@@ -290,7 +290,7 @@ SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}
> +@@ -292,7 +292,7 @@ SET_SOURCE_FILES_PROPERTIES(${MACOSX_BUNDLE_ICON_FILE}
> set_source_files_properties(${GAME_SOURCES} PROPERTIES COMPILE_FLAGS "-x
> objective-c++")
> #set_source_files_properties(${GAME_SOURCES} PROPERTIES COMPILE_FLAGS
> "-stdlib=libc++")
> else()
> @@ -44,7 +44,7 @@ Index: CMakeLists.txt
> endif()
>
> if(WIN32)
> -@@ -307,9 +307,9 @@ if(WIN32)
> +@@ -309,9 +309,9 @@ if(WIN32)
> else()
> if("${CMAKE_SIZEOF_VOID_P}" EQUAL "8")
> # 64 bit
> @@ -56,7 +56,7 @@ Index: CMakeLists.txt
> if (STEAMWORKS_ENABLED)
> target_link_libraries(barony ${STEAMWORKS_LIBRARY})
> #target_link_libraries(barony ${STEAMWORKS_CWRAPPER_LIBRARIES} -lstdc++)
> -@@ -322,15 +322,15 @@ else()
> +@@ -324,16 +324,16 @@ else()
> find_path(EXECINFO_INC NAMES execinfo.h)
> find_library(EXECINFO_LIB NAMES execinfo)
> include_directories(${EXECINFO_INC})
> @@ -66,18 +66,20 @@ Index: CMakeLists.txt
> endif()
> -target_link_libraries(barony ${OPENGL_LIBRARIES})
> -target_link_libraries(barony ${THREADS_LIBRARIES})
> --target_link_libraries(barony -lm)
> +-target_link_libraries(barony -lm -lc)
> +target_link_libraries(barony-bin ${OPENGL_LIBRARIES})
> +target_link_libraries(barony-bin ${THREADS_LIBRARIES})
> -+target_link_libraries(barony-bin -lm)
> ++target_link_libraries(barony-bin -lm -lc)
> if( NOT WIN32 AND NOT APPLE)
> #Remember, Windows and Mac aren't using find_package for FMOD and PNG.
> - target_link_libraries(barony ${PNG_LIBRARY})
> -+ target_link_libraries(barony-bin ${PNG_LIBRARY})
> +- target_link_libraries(barony ${PHYSFS_LIBRARY})
> ++ target_link_libraries(barony-bin ${PNG_LIBRARY})
> ++ target_link_libraries(barony-bin ${PHYSFS_LIBRARY})
> if (FMOD_FOUND)
> target_link_libraries(barony ${FMOD_LIBRARY})
> endif()
> -@@ -345,14 +345,14 @@ if(APPLE)
> +@@ -352,14 +352,14 @@ if(APPLE)
> target_link_libraries(barony -lfmodex) #Finally manually link fmod for
> mac.
> endif()
> endif()
> @@ -96,7 +98,7 @@ Index: CMakeLists.txt
> endif()
> endif()
>
> -@@ -365,7 +365,7 @@ if (NOT APPLE AND UNIX)
> +@@ -372,7 +372,7 @@ if (NOT APPLE AND UNIX)
> endif()
> message(STATUS "Base data directory ${BASE_DATA_DIR}")
>
> @@ -105,7 +107,7 @@ Index: CMakeLists.txt
> RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
> COMPONENT Runtime
> )
> -@@ -445,7 +445,7 @@ if (NOT APPLE AND UNIX)
> +@@ -457,7 +457,7 @@ if (NOT APPLE AND UNIX)
> RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Runtime
> )
>
> Index: pkg/README
> ===================================================================
> RCS file: /cvs/ports/games/barony/pkg/README,v
> retrieving revision 1.2
> diff -u -p -r1.2 README
> --- pkg/README 4 Sep 2018 12:46:12 -0000 1.2
> +++ pkg/README 28 Sep 2018 21:44:44 -0000
> @@ -11,7 +11,7 @@ Barony requires the original game files
> 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 package to
> +barony_cursed_edition_3_2_2_24038.sh and use the unzip package to
> extract the data.
>
> The files will be in a directory named data/noarch/game. You can move
> @@ -20,7 +20,7 @@ directory for a global install. You will
> 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_3_2_2_24038.sh
> $ doas cp -R data/noarch/game/* ${TRUEPREFIX}/share/barony
> $ doas find ${TRUEPREFIX}/share/barony -type d ! -perm 755 -exec chmod 755
> {} \;
>
