Update to megaglest-3.13.0
- Switch to GH_* - Drop gettext from MODULES - Stop hardcoding Lua-5.1. Also works with 5.2 and 5.3 Tested on amd64 and i386. ok bentley@ on a previous diff.
This commit is contained in:
parent
f36c27474b
commit
e468d303f4
@ -1,17 +1,18 @@
|
||||
# $OpenBSD: Makefile.inc,v 1.4 2015/04/06 12:49:52 stsp Exp $
|
||||
# $OpenBSD: Makefile.inc,v 1.5 2017/09/14 04:43:57 kirby Exp $
|
||||
|
||||
# Requires drm(4). Big-endian (powerpc) isn't supported according to upstream.
|
||||
ONLY_FOR_ARCHS = amd64 i386
|
||||
V = 3.11.1
|
||||
|
||||
GH_ACCOUNT = MegaGlest
|
||||
GH_TAGNAME = 3.13.0
|
||||
|
||||
CATEGORIES = games
|
||||
|
||||
HOMEPAGE = http://megaglest.org/
|
||||
|
||||
# GPLv3 + Creative Commons CC-BY-SA
|
||||
PERMIT_PACKAGE_CDROM = Yes
|
||||
|
||||
MASTER_SITES = https://github.com/MegaGlest/megaglest-source/releases/download/${V}/
|
||||
EXTRACT_SUFX = .tar.xz
|
||||
|
||||
MODULES += devel/cmake
|
||||
|
||||
NO_TEST = yes
|
||||
NO_TEST = Yes
|
||||
|
@ -1,29 +1,23 @@
|
||||
# $OpenBSD: Makefile,v 1.12 2017/07/26 22:45:21 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.13 2017/09/14 04:43:57 kirby Exp $
|
||||
|
||||
COMMENT = 3D real-time strategy game
|
||||
DISTNAME = megaglest-source-${V}
|
||||
PKGNAME = megaglest-${V}
|
||||
REVISION = 2
|
||||
GH_PROJECT = megaglest-source
|
||||
PKGNAME = megaglest-${GH_TAGNAME}
|
||||
|
||||
WANTLIB += ${MODLUA_WANTLIB}
|
||||
WANTLIB += GL GLEW GLU SDL X11 c crypto curl fontconfig freetype fribidi
|
||||
WANTLIB += ftgl glib-2.0 ircclient jpeg m miniupnpc nghttp2 openal png
|
||||
WANTLIB += pthread ssl ${COMPILER_LIBCXX} vlc vlccore vorbisfile wx_base
|
||||
WANTLIB += wx_gtk2_core wx_gtk2_gl z
|
||||
WANTLIB += GL GLEW GLU ICE SDL2 SM X11 Xext c crypto curl fontconfig
|
||||
WANTLIB += freetype fribidi ftgl glib-2.0 intl ircclient jpeg m
|
||||
WANTLIB += miniupnpc nghttp2 openal png pthread ssl vlc vlccore
|
||||
WANTLIB += vorbisfile wx_base wx_gtk2_core wx_gtk2_gl z
|
||||
WANTLIB += ${COMPILER_LIBCXX} ${MODLUA_WANTLIB}
|
||||
|
||||
MODULES = lang/lua
|
||||
|
||||
MODULES = devel/gettext \
|
||||
lang/lua
|
||||
# undefined reference to `luaL_loadbuffer' with lua >= 5.2
|
||||
MODLUA_VERSION = 5.1
|
||||
BUILD_DEPENDS = devel/help2man
|
||||
RUN_DEPENDS = games/megaglest/data \
|
||||
devel/desktop-file-utils
|
||||
RUN_DEPENDS = games/megaglest/data
|
||||
LIB_DEPENDS = audio/openal \
|
||||
devel/sdl \
|
||||
devel/sdl2 \
|
||||
graphics/glew \
|
||||
graphics/ftgl \
|
||||
graphics/jpeg \
|
||||
graphics/png \
|
||||
net/curl \
|
||||
net/libircclient \
|
||||
net/miniupnp/miniupnpc \
|
||||
@ -31,9 +25,8 @@ LIB_DEPENDS = audio/openal \
|
||||
x11/wxWidgets
|
||||
|
||||
CONFIGURE_ARGS = -DBUILD_MEGAGLEST_MODEL_IMPORT_EXPORT_TOOLS=0 \
|
||||
-DFORCE_LUA_5_2=0 -DFORCE_LUA_5_1=1 \
|
||||
-DFORCE_LUA_VERSION=${MODLUA_VERSION} \
|
||||
-DMEGAGLEST_MANPAGE_INSTALL_PATH="${LOCALBASE}/man/man6"
|
||||
WRKDIST = ${WRKDIR}/${PKGNAME}
|
||||
|
||||
pre-configure:
|
||||
@${SUBST_CMD} ${WRKSRC}/mk/cmake/Modules/FindLUA.cmake \
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (megaglest-source-3.11.1.tar.xz) = lOKKlijzWTzjN85mPyWKElF2sREo8Wr7jJR/J2OTCEE=
|
||||
SIZE (megaglest-source-3.11.1.tar.xz) = 2863180
|
||||
SHA256 (megaglest-source-3.13.0.tar.gz) = 4C5YwjKVWMxdZzdLXl+bPPqvwwC5b+/3HfjUsNOeHqo=
|
||||
SIZE (megaglest-source-3.13.0.tar.gz) = 3654897
|
||||
|
@ -1,25 +1,23 @@
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
--- CMakeLists.txt.orig Mon Mar 9 00:09:12 2015
|
||||
+++ CMakeLists.txt Mon Apr 6 10:42:34 2015
|
||||
@@ -193,7 +193,7 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||
SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3")
|
||||
$OpenBSD: patch-CMakeLists_txt,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
--- CMakeLists.txt.orig Sun Jan 24 14:00:38 2016
|
||||
+++ CMakeLists.txt Thu Jan 28 14:38:13 2016
|
||||
@@ -195,16 +195,16 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||
ENDIF()
|
||||
|
||||
# Debug compiler flags
|
||||
- SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g3")
|
||||
+ SET(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -g")
|
||||
|
||||
# Release compiler flags
|
||||
- SET(CMAKE_CXX_FLAGS_RELEASE "-O3 ${CMAKE_CXX_FLAGS_RELEASE} -O3 ")
|
||||
+ SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} ")
|
||||
IF(CMAKE_GENERATOR STREQUAL Xcode)
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") ## Strip binary
|
||||
ELSE()
|
||||
@@ -201,10 +201,10 @@ IF(CMAKE_COMPILER_IS_GNUCXX OR MINGW)
|
||||
IF(NOT CMAKE_GENERATOR STREQUAL Xcode)
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE} -s") ## Strip binary
|
||||
ENDIF()
|
||||
|
||||
# Release with debug info compiler flags
|
||||
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 ")
|
||||
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g ")
|
||||
- SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 ${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g -O3 ")
|
||||
+ SET(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -g ")
|
||||
|
||||
# Release minimum size compiler flags
|
||||
- SET(CMAKE_CXX_FLAGS_MINSIZEREL "-O3 ${CMAKE_CXX_FLAGS_MINSIZEREL} -O3 ")
|
||||
+ SET(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} ")
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_MINSIZEREL "${CMAKE_EXE_LINKER_FLAGS_MINSIZEREL}") ## Strip binary
|
||||
IF(CMAKE_GENERATOR STREQUAL Xcode)
|
||||
SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "${CMAKE_EXE_LINKER_FLAGS_RELEASE}") ## Strip binary
|
||||
IF(NOT CMAKE_GENERATOR STREQUAL Xcode)
|
||||
|
@ -1,30 +0,0 @@
|
||||
$OpenBSD: patch-mk_cmake_Modules_FindLUA_cmake,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
--- mk/cmake/Modules/FindLUA.cmake.orig Mon Mar 9 00:09:10 2015
|
||||
+++ mk/cmake/Modules/FindLUA.cmake Mon Apr 6 10:37:53 2015
|
||||
@@ -48,6 +48,8 @@ FIND_PATH(LUA_INCLUDE_DIR NAMES lua.hpp
|
||||
PATHS ${LUA_FIND_INCLUDE_PATHS}
|
||||
IF(FreeBSD)
|
||||
SET(PATHS "/usr/local/include/lua51")
|
||||
+ IF(OpenBSD)
|
||||
+ SET(PATHS "${TRUEPREFIX}/include/lua-${MODLUA_VERSION}")
|
||||
ENDIF()
|
||||
$ENV{LUA_HOME}
|
||||
)
|
||||
@@ -57,6 +59,8 @@ IF (LUA_STATIC AND NOT LUA_LIBRARIES)
|
||||
PATHS
|
||||
IF(FreeBSD)
|
||||
SET(PATHS "/usr/local/lib/lua51")
|
||||
+ IF(OpenBSD)
|
||||
+ SET(PATHS "${TRUEPREFIX}/lib/lua/${MODLUA_VERSION}")
|
||||
ENDIF()
|
||||
$ENV{LUA_HOME})
|
||||
|
||||
@@ -65,6 +69,8 @@ ELSE()
|
||||
PATHS
|
||||
IF(FreeBSD)
|
||||
SET(PATHS "/usr/local/lib/lua51")
|
||||
+ IF(OpenBSD)
|
||||
+ SET(PATHS "${TRUEPREFIX}/lib/lua/${MODLUA_VERSION}")
|
||||
ENDIF()
|
||||
$ENV{LUA_HOME})
|
||||
ENDIF()
|
@ -1,7 +1,7 @@
|
||||
$OpenBSD: patch-mk_cmake_Modules_FindMiniupnpc_cmake,v 1.3 2015/04/06 12:49:52 stsp Exp $
|
||||
--- mk/cmake/Modules/FindMiniupnpc.cmake.orig Mon Mar 9 00:09:10 2015
|
||||
+++ mk/cmake/Modules/FindMiniupnpc.cmake Mon Apr 6 10:35:53 2015
|
||||
@@ -154,6 +154,7 @@ if (MINIUPNP_FOUND)
|
||||
$OpenBSD: patch-mk_cmake_Modules_FindMiniupnpc_cmake,v 1.4 2017/09/14 04:43:57 kirby Exp $
|
||||
--- mk/cmake/Modules/FindMiniupnpc.cmake.orig Sun Jan 24 14:00:38 2016
|
||||
+++ mk/cmake/Modules/FindMiniupnpc.cmake Thu Jan 28 14:32:22 2016
|
||||
@@ -153,6 +153,7 @@ if (MINIUPNP_FOUND)
|
||||
{
|
||||
char externalIP[16] = \"\";
|
||||
int compileTest = 1;
|
||||
@ -9,7 +9,7 @@ $OpenBSD: patch-mk_cmake_Modules_FindMiniupnpc_cmake,v 1.3 2015/04/06 12:49:52 s
|
||||
if(compileTest == 0) UPNP_GetExternalIPAddress(urls.controlURL, data.first.servicetype, externalIP);
|
||||
|
||||
return 0;
|
||||
@@ -175,6 +176,7 @@ if (MINIUPNP_FOUND)
|
||||
@@ -174,6 +175,7 @@ if (MINIUPNP_FOUND)
|
||||
{
|
||||
char externalIP[16] = \"\";
|
||||
int compileTest = 1;
|
||||
|
@ -1,21 +1,29 @@
|
||||
$OpenBSD: patch-source_g3d_viewer_CMakeLists_txt,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
$OpenBSD: patch-source_g3d_viewer_CMakeLists_txt,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
Program fails to start ("unable to init GTK") when help2man runs it.
|
||||
--- source/g3d_viewer/CMakeLists.txt.orig Mon Mar 9 00:09:09 2015
|
||||
+++ source/g3d_viewer/CMakeLists.txt Mon Apr 6 10:26:10 2015
|
||||
@@ -166,7 +166,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
ENDIF()
|
||||
Index: source/g3d_viewer/CMakeLists.txt
|
||||
--- source/g3d_viewer/CMakeLists.txt.orig
|
||||
+++ source/g3d_viewer/CMakeLists.txt
|
||||
@@ -197,13 +197,13 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
- IF(EXISTS ${HELP2MAN})
|
||||
- IF(EXISTS ${HELP2MAN} AND NOT APPLE)
|
||||
+ IF(FALSE)
|
||||
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
|
||||
# on mac <> --help sometimes hangs, so we need "NOT APPLE" ^ or some timeout here for now
|
||||
MESSAGE(STATUS "***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
|
||||
|
||||
SET(MG_MANPAGE_DESCRIPTION "G3D Model editor for the popular 3D realtime strategy game")
|
||||
@@ -191,7 +191,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
|
||||
- IF(EXISTS ${XVFB_EXEC})
|
||||
+ IF(FALSE)
|
||||
MESSAGE(STATUS "***-- Found xvfb-run: ${XVFB_EXEC} about to build manpage with it.")
|
||||
|
||||
add_custom_target(${TARGET_NAME_MANPAGE} ALL
|
||||
@@ -223,7 +223,7 @@ IF(BUILD_MEGAGLEST_MODEL_VIEWER)
|
||||
${TARGET_NAME}
|
||||
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
|
||||
|
||||
- IF(EXISTS ${HELP2MAN})
|
||||
- IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
|
||||
+ IF(FALSE)
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
|
||||
|
@ -1,21 +1,22 @@
|
||||
$OpenBSD: patch-source_glest_map_editor_CMakeLists_txt,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
$OpenBSD: patch-source_glest_map_editor_CMakeLists_txt,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
Program fails to start ("unable to init GTK") when help2man runs it.
|
||||
--- source/glest_map_editor/CMakeLists.txt.orig Mon Mar 9 00:09:09 2015
|
||||
+++ source/glest_map_editor/CMakeLists.txt Mon Apr 6 10:34:01 2015
|
||||
@@ -159,7 +159,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
||||
ENDIF()
|
||||
Index: source/glest_map_editor/CMakeLists.txt
|
||||
--- source/glest_map_editor/CMakeLists.txt.orig
|
||||
+++ source/glest_map_editor/CMakeLists.txt
|
||||
@@ -187,7 +187,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} libmegaglest)
|
||||
TARGET_LINK_LIBRARIES(${TARGET_NAME} ${EXTERNAL_LIBS})
|
||||
|
||||
- IF(EXISTS ${HELP2MAN})
|
||||
- IF(EXISTS ${HELP2MAN} AND NOT APPLE)
|
||||
+ IF(FALSE)
|
||||
MESSAGE("***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
|
||||
# on mac <> --help sometimes hangs, so we need "NOT APPLE" ^ or some timeout here for now
|
||||
MESSAGE(STATUS "***-- Found help2man: ${HELP2MAN} about to build manpage in [${HELP2MAN_OUT_PATH}${TARGET_NAME_MANPAGE}]")
|
||||
|
||||
SET(MG_MANPAGE_DESCRIPTION "Map editor for the popular 3D realtime strategy game")
|
||||
@@ -185,7 +185,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
||||
@@ -213,7 +213,7 @@ IF(BUILD_MEGAGLEST_MAP_EDITOR)
|
||||
${TARGET_NAME}
|
||||
DESTINATION ${MEGAGLEST_BIN_INSTALL_PATH})
|
||||
|
||||
- IF(EXISTS ${HELP2MAN})
|
||||
- IF(EXISTS ${HELP2MAN} AND NOT "${MEGAGLEST_MANPAGE_INSTALL_PATH}" STREQUAL "" AND NOT APPLE)
|
||||
+ IF(FALSE)
|
||||
MESSAGE(STATUS "**NOTE: Will Install manpage [${TARGET_NAME_MANPAGE}] to [${MEGAGLEST_MANPAGE_INSTALL_PATH}]")
|
||||
|
||||
|
@ -1,8 +1,10 @@
|
||||
$OpenBSD: patch-source_shared_lib_include_platform_sdl_platform_main_h,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
$OpenBSD: patch-source_shared_lib_include_platform_sdl_platform_main_h,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
|
||||
Fix for i386 PIE (ebx is reserved).
|
||||
--- source/shared_lib/include/platform/sdl/platform_main.h.orig Mon Mar 9 00:09:09 2015
|
||||
+++ source/shared_lib/include/platform/sdl/platform_main.h Mon Apr 6 09:51:53 2015
|
||||
@@ -597,9 +597,16 @@ int mainSetup(int argc, char **argv) {
|
||||
|
||||
--- source/shared_lib/include/platform/sdl/platform_main.h.orig Sun Jan 24 14:00:38 2016
|
||||
+++ source/shared_lib/include/platform/sdl/platform_main.h Mon Nov 28 13:30:11 2016
|
||||
@@ -601,9 +601,16 @@ int mainSetup(int argc, char **argv) {
|
||||
|
||||
#define CHECK_BIT(var,pos) ((var) & (1<<(pos)))
|
||||
|
||||
|
@ -1,106 +0,0 @@
|
||||
$OpenBSD: patch-source_shared_lib_sources_platform_common_platform_common_cpp,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
--- source/shared_lib/sources/platform/common/platform_common.cpp.orig Mon Mar 9 00:09:09 2015
|
||||
+++ source/shared_lib/sources/platform/common/platform_common.cpp Mon Apr 6 10:27:35 2015
|
||||
@@ -1057,7 +1057,7 @@ uint32 getFolderTreeContentsCheckSumRecursively(const
|
||||
glob_t globbuf;
|
||||
|
||||
int res = glob(mypath.c_str(), 0, 0, &globbuf);
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#2 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1091,13 +1091,13 @@ uint32 getFolderTreeContentsCheckSumRecursively(const
|
||||
globfree(&globbuf);
|
||||
|
||||
// Look recursively for sub-folders
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
res = glob(mypath.c_str(), 0, 0, &globbuf);
|
||||
#else
|
||||
res = glob(mypath.c_str(), GLOB_ONLYDIR, 0, &globbuf);
|
||||
#endif
|
||||
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#3 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1106,7 +1106,7 @@ uint32 getFolderTreeContentsCheckSumRecursively(const
|
||||
#endif
|
||||
|
||||
for(int i = 0; i < (int)globbuf.gl_pathc; ++i) {
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
struct stat statStruct;
|
||||
// only process if dir..
|
||||
int actStat = lstat( globbuf.gl_pathv[i], &statStruct);
|
||||
@@ -1238,7 +1238,7 @@ vector<string> getFolderTreeContentsListRecursively(co
|
||||
}
|
||||
|
||||
int res = glob(mypath.c_str(), globFlags, 0, &globbuf);
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#4 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1271,14 +1271,14 @@ vector<string> getFolderTreeContentsListRecursively(co
|
||||
globfree(&globbuf);
|
||||
|
||||
// Look recursively for sub-folders
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
res = glob(mypath.c_str(), 0, 0, &globbuf);
|
||||
#else //APPLE doesn't have the GLOB_ONLYDIR definition..
|
||||
globFlags |= GLOB_ONLYDIR;
|
||||
res = glob(mypath.c_str(), globFlags, 0, &globbuf);
|
||||
#endif
|
||||
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#5 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1287,7 +1287,7 @@ vector<string> getFolderTreeContentsListRecursively(co
|
||||
#endif
|
||||
|
||||
for(int i = 0; i < (int)globbuf.gl_pathc; ++i) {
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
struct stat statStruct;
|
||||
// only get if dir..
|
||||
int actStat = lstat( globbuf.gl_pathv[ i], &statStruct);
|
||||
@@ -1379,7 +1379,7 @@ vector<std::pair<string,uint32> > getFolderTreeContent
|
||||
|
||||
int res = glob(mypath.c_str(), 0, 0, &globbuf);
|
||||
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#6 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1411,13 +1411,13 @@ vector<std::pair<string,uint32> > getFolderTreeContent
|
||||
globfree(&globbuf);
|
||||
|
||||
// Look recursively for sub-folders
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
res = glob(mypath.c_str(), 0, 0, &globbuf);
|
||||
#else //APPLE doesn't have the GLOB_ONLYDIR definition..
|
||||
res = glob(mypath.c_str(), GLOB_ONLYDIR, 0, &globbuf);
|
||||
#endif
|
||||
|
||||
-#if !defined(__APPLE__) && !defined(__FreeBSD__)
|
||||
+#if !defined(__APPLE__) && !defined(__FreeBSD__) && !defined(__OpenBSD__)
|
||||
if(res < 0) {
|
||||
std::stringstream msg;
|
||||
msg << "#7 Couldn't scan directory '" << mypath << "': " << strerror(errno);
|
||||
@@ -1426,7 +1426,7 @@ vector<std::pair<string,uint32> > getFolderTreeContent
|
||||
#endif
|
||||
|
||||
for(int i = 0; i < (int)globbuf.gl_pathc; ++i) {
|
||||
-#if defined(__APPLE__) || defined(__FreeBSD__)
|
||||
+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(__OpenBSD__)
|
||||
struct stat statStruct;
|
||||
// only get if dir..
|
||||
int actStat = lstat( globbuf.gl_pathv[ i], &statStruct);
|
@ -1,12 +0,0 @@
|
||||
$OpenBSD: patch-source_shared_lib_sources_platform_posix_socket_cpp,v 1.3 2015/04/06 12:49:52 stsp Exp $
|
||||
--- source/shared_lib/sources/platform/posix/socket.cpp.orig Mon Mar 9 00:09:09 2015
|
||||
+++ source/shared_lib/sources/platform/posix/socket.cpp Mon Apr 6 09:51:53 2015
|
||||
@@ -317,7 +317,7 @@ string Ip::getString() const{
|
||||
// class Socket
|
||||
// ===============================================
|
||||
|
||||
-#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__) || defined(__linux__)
|
||||
+#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(BSD) || defined(__APPLE__) || defined(__linux__) || defined(__OpenBSD__)
|
||||
# define USE_GETIFADDRS 1
|
||||
# include <ifaddrs.h>
|
||||
#endif
|
@ -1,19 +1,12 @@
|
||||
@comment $OpenBSD: PLIST,v 1.2 2015/04/06 12:49:52 stsp Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
@bin bin/megaglest
|
||||
@bin bin/megaglest_editor
|
||||
@bin bin/megaglest_g3dviewer
|
||||
@man man/man6/megaglest.6
|
||||
share/applications/megaglest.desktop
|
||||
share/applications/megaglest_editor.desktop
|
||||
share/applications/megaglest_g3dviewer.desktop
|
||||
share/megaglest/editor.ico
|
||||
share/megaglest/g3dviewer.ico
|
||||
share/megaglest/glest.ini
|
||||
share/megaglest/glestkeys.ini
|
||||
share/megaglest/megaglest.ico
|
||||
share/megaglest/servers.ini
|
||||
share/pixmaps/
|
||||
share/pixmaps/megaglest.ico
|
||||
share/pixmaps/megaglest.png
|
||||
share/pixmaps/megaglest.xpm
|
||||
@exec %D/bin/update-desktop-database
|
||||
@unexec-delete %D/bin/update-desktop-database
|
||||
share/megaglest/start_megaglest_gameserver
|
||||
|
@ -1,8 +1,11 @@
|
||||
# $OpenBSD: Makefile,v 1.2 2014/07/13 20:18:45 kirby Exp $
|
||||
# $OpenBSD: Makefile,v 1.3 2017/09/14 04:43:57 kirby Exp $
|
||||
|
||||
COMMENT = megaglest game data files
|
||||
DISTNAME = megaglest-data-${V}
|
||||
WRKDIST = ${WRKDIR}/megaglest-${V}
|
||||
GH_PROJECT = megaglest-data
|
||||
|
||||
RUN_DEPENDS = devel/desktop-file-utils
|
||||
CONFIGURE_ARGS += -DMEGAGLEST_MENU_INSTALL_PATH=""
|
||||
|
||||
NO_BUILD = Yes
|
||||
PKG_ARCH = *
|
||||
|
||||
|
@ -1,2 +1,2 @@
|
||||
SHA256 (megaglest-data-3.11.1.tar.xz) = Xx9q2fiakpEiom4cHKvIh7dcCfSoRyDZzlqmqg/Jy+g=
|
||||
SIZE (megaglest-data-3.11.1.tar.xz) = 283383936
|
||||
SHA256 (megaglest-data-3.13.0.tar.gz) = mXdWAernjixia8p2puk1lJHhNoVUHja+4NMgf4EVLl4=
|
||||
SIZE (megaglest-data-3.13.0.tar.gz) = 353518497
|
||||
|
File diff suppressed because it is too large
Load Diff
Loading…
x
Reference in New Issue
Block a user