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.
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 9 Nov 2017 03:01:25 -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}
.if ${FLAVOR:Mno_x11}
WANTLIB+= ncurses
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 9 Nov 2017 03:01:25 -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 {
