cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to returntotheroots-0.8.2.20180107

Browse Source 
Upstream now provides a RTTR_EXTRA_BINDIR setting which we can use to not
install some binaries to an awkward bin/RTTR directory. We settled on
libexec/s25rttr as the directory.
This commit is contained in:
bcallah 2018-01-09 03:47:55 +00:00
parent c22f4753e3
commit be085b2bd0
8 changed files with 46 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
games/returntotheroots/Makefile
View File

@ -1,6 +1,6 @@
# $OpenBSD: Makefile,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
# $OpenBSD: Makefile,v 1.2 2018/01/09 03:47:55 bcallah Exp $
V = 0.8.2.20171230
V = 0.8.2.20180107
COMMENT = open source engine remake of The Settlers 2 (s25client)
DISTNAME = s25client-${V}
PKGNAME = returntotheroots-${V}
@ -35,7 +35,8 @@ LIB_DEPENDS = archivers/bzip2 \
devel/sdl-mixer \
net/miniupnp/miniupnpc
CONFIGURE_ARGS = -DRTTR_ENABLE_WERROR:Bool=OFF
CONFIGURE_ARGS = -DRTTR_ENABLE_WERROR:Bool=OFF \
-DRTTR_EXTRA_BINDIR="${LOCALBASE}/libexec/s25rttr"
post-extract:
@cp ${WRKSRC}/cmake/freebsd.cmake ${WRKSRC}/cmake/openbsd.cmake

4
games/returntotheroots/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (s25client-0.8.2.20171230.tar.gz) = z/4GjbUDs2VYcGyTyjFVJpuehljZfw6AKX/cCWOwVVI=
SIZE (s25client-0.8.2.20171230.tar.gz) = 37210680
SHA256 (s25client-0.8.2.20180107.tar.gz) = lXe5Fu9X7EK6rONXygGwEyT8LHE4A2haWnWr0g9kPOI=
SIZE (s25client-0.8.2.20180107.tar.gz) = 37242355

6
games/returntotheroots/patches/patch-CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2018/01/09 03:47:55 bcallah Exp $
Disable updater. Don't install a useless bash script.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -410,7 +410,7 @@ endif()
@@ -412,7 +412,7 @@ endif()
# Building the updater when using non-default paths (especially absolute paths)
# is not recommended as it most likely won't work
@ -14,7 +14,7 @@ Index: CMakeLists.txt
foreach(curDirVar BINDIR DATADIR LIBDIR DOCDIR DRIVERDIR)
if(IS_ABSOLUTE ${RTTR_${curDirVar}})
set(RTTR_BUILD_UPDATER_DEF OFF)
@@ -471,7 +471,7 @@ IF (WIN32)
@@ -473,7 +473,7 @@ IF (WIN32)
install(PROGRAMS "release/bin/rttr.bat" DESTINATION "${RTTR_BINDIR}")
ELSEIF(CMAKE_SYSTEM_NAME STREQUAL "Linux" OR CMAKE_SYSTEM_NAME STREQUAL "FreeBSD" OR CYGWIN)
install(PROGRAMS "release/bin/rttr.sh" DESTINATION "${RTTR_BINDIR}")

15
games/returntotheroots/patches/patch-mygettext_src_LocaleInfo_cpp
View File

@ -1,15 +0,0 @@
$OpenBSD: patch-mygettext_src_LocaleInfo_cpp,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
Missing cstdlib
Index: mygettext/src/LocaleInfo.cpp
--- mygettext/src/LocaleInfo.cpp.orig
+++ mygettext/src/LocaleInfo.cpp
@@ -8,6 +8,7 @@
#include "LocaleInfo.h"
#include <boost/config.hpp>
#include <cstring>
+#include <cstdlib>
#if defined(BOOST_WINDOWS) || defined(__CYGWIN__)
#ifndef NOMINMAX
#define NOMINMAX

14
games/returntotheroots/patches/patch-src_CMakeLists_txt
View File

@ -1,14 +0,0 @@
$OpenBSD: patch-src_CMakeLists_txt,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
Index: src/CMakeLists.txt
--- src/CMakeLists.txt.orig
+++ src/CMakeLists.txt
@@ -43,7 +43,7 @@ ENDif()
# LUA
################################################################################
-SET(LUA_VERSION "52")
+SET(LUA_VERSION "5.2")
FIND_PACKAGE(LUA REQUIRED)

25
games/returntotheroots/patches/patch-src_libGamedata_CMakeLists_txt Normal file
View File

@ -0,0 +1,25 @@
$OpenBSD: patch-src_libGamedata_CMakeLists_txt,v 1.1 2018/01/09 03:47:55 bcallah Exp $
Index: src/libGamedata/CMakeLists.txt
--- src/libGamedata/CMakeLists.txt.orig
+++ src/libGamedata/CMakeLists.txt
@@ -15,7 +15,7 @@ SOURCE_GROUP(other FILES ${SOURCES_OTHER})
# LUA
################################################################################
-SET(LUA_VERSION "52")
+SET(LUA_VERSION "5.2")
FIND_PACKAGE(LUA REQUIRED)
@@ -34,6 +34,6 @@ TARGET_LINK_LIBRARIES(gamedata
PUBLIC ${LUA_LIBRARY}
)
-if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- TARGET_LINK_LIBRARIES(gamedata PUBLIC dl)
-ENDif()
\ No newline at end of file
+if(CMAKE_SYSTEM_NAME STREQUAL "OpenBSD")
+ TARGET_LINK_LIBRARIES(gamedata PUBLIC)
+ENDif()

4
games/returntotheroots/patches/patch-src_test_CMakeLists_txt
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_test_CMakeLists_txt,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
$OpenBSD: patch-src_test_CMakeLists_txt,v 1.2 2018/01/09 03:47:55 bcallah Exp $
Let test link.
Index: src/test/CMakeLists.txt
--- src/test/CMakeLists.txt.orig
+++ src/test/CMakeLists.txt
@@ -24,6 +24,7 @@ target_link_libraries(Test
@@ -28,6 +28,7 @@ target_link_libraries(Test
audioMockup
videoMockup
${Boost_UNIT_TEST_FRAMEWORK_LIBRARY}

16
games/returntotheroots/pkg/PLIST
View File

@ -1,7 +1,4 @@
@comment $OpenBSD: PLIST,v 1.1.1.1 2018/01/01 01:03:55 bcallah Exp $
bin/RTTR/
@bin bin/RTTR/s-c_resample
@bin bin/RTTR/sound-convert
@comment $OpenBSD: PLIST,v 1.2 2018/01/09 03:47:55 bcallah Exp $
@bin bin/s25client
@bin bin/s25edit
lib/driver/
@ -9,6 +6,9 @@ lib/driver/audio/
lib/driver/audio/libaudioSDL.so
lib/driver/video/
lib/driver/video/libvideoSDL.so
libexec/s25rttr/
@bin libexec/s25rttr/s-c_resample
@bin libexec/s25rttr/sound-convert
share/doc/pkg-readmes/${FULLPKGNAME}
share/doc/s25rttr/
share/doc/s25rttr/de_DE/
@ -334,8 +334,12 @@ share/s25rttr/RTTR/MUSIC/SNG/SNG_0011.OGG
share/s25rttr/RTTR/MUSIC/SNG/SNG_0012.OGG
share/s25rttr/RTTR/MUSIC/SNG/SNG_0013.OGG
share/s25rttr/RTTR/MUSIC/SNG/SNG_0014.OGG
share/s25rttr/RTTR/SAVE/
share/s25rttr/RTTR/SAVE/README
share/s25rttr/RTTR/gamedata/
share/s25rttr/RTTR/gamedata/world/
share/s25rttr/RTTR/gamedata/world/default.lua
share/s25rttr/RTTR/gamedata/world/greenland.lua
share/s25rttr/RTTR/gamedata/world/wasteland.lua
share/s25rttr/RTTR/gamedata/world/winterworld.lua
share/s25rttr/RTTR/languages/
share/s25rttr/RTTR/languages/README.md
share/s25rttr/RTTR/languages/rttr-cs.mo