Re: games/cataclysm-dda fix for gcc archs and localization

2017-11-19 Thread trondd 
On Sun, November 12, 2017 4:59 pm, trondd wrote:
> trondd  wrote:
>
>> trondd  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.

Bump again to fix the bulk builds.

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 -  1.1.1.1
> +++ Makefile  12 Nov 2017 21:54:09 -
> @@ -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-Makefile29 Oct 2017 17:27:18 -  1.1.1.1
> +++ patches/patch-Makefile12 Nov 2017 21:54:09 -
> @@ -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 -
> +++ patches/patch-src_translations_cpp12 Nov 2017 21:54:09 -
> @@ -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 {
>

Re: games/cataclysm-dda fix for gcc archs and localization

2017-11-12 Thread trondd 
trondd  wrote:

> trondd  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
--- Makefile29 Oct 2017 17:27:18 -  1.1.1.1
+++ Makefile12 Nov 2017 21:54:09 -
@@ -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 -  1.1.1.1
+++ patches/patch-Makefile  12 Nov 2017 21:54:09 -
@@ -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 -
+++ patches/patch-src_translations_cpp  12 Nov 2017 21:54:09 -
@@ -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 {

games/cataclysm-dda fix for gcc archs and localization

2017-11-09 Thread trondd 
trondd  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
--- Makefile29 Oct 2017 17:27:18 -  1.1.1.1
+++ Makefile9 Nov 2017 03:01:25 -
@@ -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 -
+++ patches/patch-src_translations_cpp  9 Nov 2017 03:01:25 -
@@ -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 {

games/cataclysm-dda fix for gcc archs

2017-11-05 Thread trondd 
Attempting to allow compilation on GCC archs.  Just
a slight tweak and addition of a COMPILER list.

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
--- Makefile29 Oct 2017 17:27:18 -  1.1.1.1
+++ Makefile5 Nov 2017 16:49:36 -
@@ -20,6 +20,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 +31,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