trondd <tro...@kagu-tsuchi.com> wrote: > trondd <tro...@kagu-tsuchi.com> wrote: > > > Attempting to allow compilation on GCC archs. Just > > a slight tweak and addition of a COMPILER list. > > > > Tim. > > > > Also fix localization support. Problem found and fix confirmed by > Roman Yakovlev < mail (at) 51t.ru >. > > Tim.
Bump and also one more little tweak to pass the LUA binary. Tim. Index: Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 Makefile --- Makefile 29 Oct 2017 17:27:18 -0000 1.1.1.1 +++ Makefile 12 Nov 2017 21:54:09 -0000 @@ -3,6 +3,7 @@ COMMENT= rogue-like zombie survival game DISTNAME= cataclysm-dda-2017.10.13 CATEGORIES= games +REVISION= 0 GH_ACCOUNT= CleverRaven GH_PROJECT= Cataclysm-DDA @@ -20,6 +21,8 @@ FLAVOR?= WANTLIB= ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c \ iconv intl m pthread +COMPILER= base-clang ports-gcc + MODULES= lang/lua \ textproc/intltool MODLUA_VERSION= 5.3 @@ -29,10 +32,10 @@ BUILD_DEPENDS= devel/libexecinfo LIB_DEPENDS= devel/gettext -MAKE_ENV= CXXFLAGS="${CXXFLAGS}" +MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}" -MAKE_FLAGS= CLANG="${CXX}" RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 \ - LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN} +MAKE_FLAGS= RELEASE=1 USE_XDG_DIR=1 LOCALIZE=1 LANGUAGES=all \ + LUA=1 LUA_BINARY=${MODLUA_BIN:T} .if ${FLAVOR:Mno_x11} WANTLIB+= ncurses Index: patches/patch-Makefile =================================================================== RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 patch-Makefile --- patches/patch-Makefile 29 Oct 2017 17:27:18 -0000 1.1.1.1 +++ patches/patch-Makefile 12 Nov 2017 21:54:09 -0000 @@ -49,15 +49,6 @@ Index: Makefile PKG_CONFIG = $(CROSS)pkg-config SDL2_CONFIG = $(CROSS)sdl2-config -@@ -464,7 +457,7 @@ ifdef LUA - else - ifdef LUA_USE_PKGCONFIG - # On unix-like systems, use pkg-config to find lua -- LUA_CANDIDATES = lua5.3 lua5.2 lua-5.3 lua-5.2 lua5.1 lua-5.1 lua $(LUA_BINARY) -+ LUA_CANDIDATES = lua5.3 lua5.2 lua-5.3 lua-5.2 lua53 lua52 lua5.1 lua-5.1 lua51 lua $(LUA_BINARY) - LUA_FOUND = $(firstword $(foreach lua,$(LUA_CANDIDATES),\ - $(shell if $(PKG_CONFIG) --silence-errors --exists $(lua); then echo $(lua);fi))) - LUA_PKG = $(if $(LUA_FOUND),$(LUA_FOUND),$(error "Lua not found by $(PKG_CONFIG), install it or make without 'LUA=1'")) @@ -696,7 +689,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS) .PHONY: version json-verify version: Index: patches/patch-src_translations_cpp =================================================================== RCS file: patches/patch-src_translations_cpp diff -N patches/patch-src_translations_cpp --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-src_translations_cpp 12 Nov 2017 21:54:09 -0000 @@ -0,0 +1,14 @@ +$OpenBSD$ + +Index: src/translations.cpp +--- src/translations.cpp.orig ++++ src/translations.cpp +@@ -80,7 +80,7 @@ void set_language() + + // Step 2. Bind to gettext domain. + std::string locale_dir; +-#if (defined __linux__ || (defined MACOSX && !defined TILES)) ++#if (defined __linux__ || defined __OpenBSD__ || (defined MACOSX && !defined TILES)) + if( !FILENAMES["base_path"].empty() ) { + locale_dir = FILENAMES["base_path"] + "share/locale"; + } else {