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

update to cataclysm-dda-0.E.

Browse Source 
from maintainer Tim Meunier, thanks!

Full Changelog:
https://github.com/CleverRaven/Cataclysm-DDA/blob/0.E/data/changelog.txt
This commit is contained in:
kirby 2020-04-11 06:41:47 +00:00
parent 5eb28a841b
commit f191456efd
6 changed files with 1601 additions and 508 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
games/cataclysm-dda/Makefile
View File

@ -1,13 +1,12 @@
# $OpenBSD: Makefile,v 1.11 2019/07/12 20:46:15 sthen Exp $
# $OpenBSD: Makefile,v 1.12 2020/04/11 06:41:47 kirby Exp $
COMMENT= rogue-like zombie survival game
DISTNAME= cataclysm-dda-0.D
DISTNAME= cataclysm-dda-0.E
CATEGORIES= games
REVISION= 0
GH_ACCOUNT= CleverRaven
GH_PROJECT= Cataclysm-DDA
GH_TAGNAME= 0.D
GH_TAGNAME= 0.E
EPOCH= 0
HOMEPAGE= https://cataclysmdda.org
@ -19,15 +18,11 @@ PERMIT_PACKAGE= Yes
FLAVORS= no_x11
FLAVOR?=
WANTLIB= ${COMPILER_LIBCXX} ${MODLUA_WANTLIB} c \
execinfo iconv intl m pthread
WANTLIB= ${COMPILER_LIBCXX} c execinfo iconv intl m pthread
COMPILER= base-clang ports-gcc
MODULES= lang/lua \
textproc/intltool
MODLUA_VERSION= 5.3
MODLUA_SA= Yes
MODULES= textproc/intltool
BUILD_DEPENDS= devel/libexecinfo
@ -36,8 +31,8 @@ LIB_DEPENDS= devel/gettext,-runtime \
MAKE_ENV= CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
MAKE_FLAGS= ASTYLE=0 BSD=1 RELEASE=1 USE_XDG_DIR=1 LINTJSON=0 \
LOCALIZE=1 LANGUAGES=all LUA=1 LUA_BINARY=${MODLUA_BIN:T}
MAKE_FLAGS= ASTYLE=0 BSD=1 RELEASE=1 USE_XDG_DIR=1 \
LINTJSON=0 LOCALIZE=1 LANGUAGES=all
.if ${FLAVOR:Mno_x11}
WANTLIB+= curses
@ -57,9 +52,6 @@ USE_GMAKE= Yes
NO_TEST= Yes
post-patch:
sed -i 's,/usr,${PREFIX},' ${WRKSRC}/lua/autoexec.lua
post-install:
${INSTALL_MAN} ${WRKSRC}/doc/cataclysm${MAN_TILES}.6 ${PREFIX}/man/man6/

4
games/cataclysm-dda/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (cataclysm-dda-0.D.tar.gz) = bMl7Ph5Ga4WF6EM6bWAQkx6aBz9uwGARMWGzgFLYKII=
SIZE (cataclysm-dda-0.D.tar.gz) = 93423203
SHA256 (cataclysm-dda-0.E.tar.gz) = sK+akpKSnhczLtzqdwvKmpHx0I6kdybXikfgkoGkL6M=
SIZE (cataclysm-dda-0.E.tar.gz) = 69933302

90
games/cataclysm-dda/patches/patch-Makefile
View File

@ -1,34 +1,35 @@
$OpenBSD: patch-Makefile,v 1.8 2019/02/13 12:24:44 kirby Exp $
$OpenBSD: patch-Makefile,v 1.9 2020/04/11 06:41:47 kirby Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -86,7 +86,6 @@
# RELEASE is flags for release builds, this disables some debugging flags and
# enforces build failure when warnings are encountered.
# We want to error on everything to make sure we don't check in code with new warnings.
-RELEASE_FLAGS = -Werror
WARNINGS = -Wall -Wextra
# Uncomment below to disable warnings
#WARNINGS = -w
@@ -276,7 +275,6 @@ ifdef RELEASE
@@ -92,7 +92,7 @@
# RELEASE_FLAGS is flags for release builds.
RELEASE_FLAGS =
WARNINGS = \
- -Werror -Wall -Wextra \
+ -Wall -Wextra \
-Wformat-signedness \
-Wlogical-op \
-Wmissing-declarations \
@@ -310,7 +310,6 @@ ifdef RELEASE
OPTLEVEL = -O3
endif
endif
- CXXFLAGS += $(OPTLEVEL)
ifdef LTO
LDFLAGS += -fuse-ld=gold
@@ -317,7 +315,7 @@ endif
ifeq ($(NATIVE), osx)
@@ -368,7 +367,7 @@ endif
ifeq ($(shell sh -c 'uname -o 2>/dev/null || echo not'),Cygwin)
OTHERS += -std=gnu++11
OTHERS += -std=gnu++14
else
- OTHERS += -std=c++11
+ OTHERS += -std=c++11 -I${LOCALBASE}/include
- OTHERS += -std=c++14
+ OTHERS += -std=c++14 -I$(LOCALBASE)/include
endif
CXXFLAGS += $(WARNINGS) $(DEBUG) $(DEBUGSYMS) $(PROFILE) $(OTHERS) -MMD -MP
@@ -462,11 +460,6 @@ ifdef MAPSIZE
ifeq ($(CYGWIN),1)
@@ -522,11 +521,6 @@ ifdef MAPSIZE
CXXFLAGS += -DMAPSIZE=$(MAPSIZE)
endif
@ -40,7 +41,16 @@ Index: Makefile
PKG_CONFIG = $(CROSS)pkg-config
SDL2_CONFIG = $(CROSS)sdl2-config
@@ -780,7 +773,7 @@ ifdef LTO
@@ -699,7 +693,7 @@ ifeq ($(BSD), 1)
# And similarly, their libcs don't have gettext built in
ifeq ($(LOCALIZE),1)
- LDFLAGS += -lintl -liconv
+ LDFLAGS += -L/usr/local/lib -lintl -liconv
endif
endif
@@ -825,7 +819,7 @@ ifdef LTO
endif
endif
@ -49,15 +59,15 @@ Index: Makefile
@
$(TARGET): $(OBJS)
@@ -799,7 +792,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
.PHONY: version json-verify
@@ -844,7 +838,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(OBJS)
.PHONY: version
version:
@( VERSION_STRING=$(VERSION) ; \
- [ -e ".git" ] && GITVERSION=$$( git describe --tags --always --dirty --match "[0-9A-Z]*.[0-9A-Z]*" ) && VERSION_STRING=$$GITVERSION ; \
[ -e "$(SRC_DIR)/version.h" ] && OLDVERSION=$$(grep VERSION $(SRC_DIR)/version.h|cut -d '"' -f2) ; \
if [ "x$$VERSION_STRING" != "x$$OLDVERSION" ]; then echo "#define VERSION \"$$VERSION_STRING\"" | tee $(SRC_DIR)/version.h ; fi \
)
@@ -853,36 +845,36 @@ distclean:
@@ -891,31 +884,31 @@ distclean:
bindist: $(BINDIST)
ifeq ($(TARGETSYSTEM), LINUX)
@ -80,6 +90,7 @@ Index: Makefile
- cp -R --no-preserve=ownership data/motd $(DATA_PREFIX)
- cp -R --no-preserve=ownership data/credits $(DATA_PREFIX)
- cp -R --no-preserve=ownership data/title $(DATA_PREFIX)
- cp -R --no-preserve=ownership data/help $(DATA_PREFIX)
+ install -m 755 $(TARGET) $(BIN_PREFIX)
+ cp -R data/core $(DATA_PREFIX)
+ cp -R data/font $(DATA_PREFIX)
@ -90,6 +101,7 @@ Index: Makefile
+ cp -R data/motd $(DATA_PREFIX)
+ cp -R data/credits $(DATA_PREFIX)
+ cp -R data/title $(DATA_PREFIX)
+ cp -R data/help $(DATA_PREFIX)
ifdef TILES
- cp -R --no-preserve=ownership gfx $(DATA_PREFIX)
+ cp -R gfx $(DATA_PREFIX)
@ -98,31 +110,31 @@ Index: Makefile
- cp -R --no-preserve=ownership data/sound $(DATA_PREFIX)
+ cp -R data/sound $(DATA_PREFIX)
endif
ifdef LUA
mkdir -p $(DATA_PREFIX)/lua
- install --mode=644 lua/autoexec.lua $(DATA_PREFIX)/lua
- install --mode=644 lua/log.lua $(DATA_PREFIX)/lua
- install --mode=644 lua/class_definitions.lua $(DATA_PREFIX)/lua
+ install -m 644 lua/autoexec.lua $(DATA_PREFIX)/lua
+ install -m 644 lua/log.lua $(DATA_PREFIX)/lua
+ install -m 644 lua/class_definitions.lua $(DATA_PREFIX)/lua
endif
- install --mode=644 data/changelog.txt data/cataicon.ico data/fontdata.json \
- LICENSE.txt -t $(DATA_PREFIX)
- LICENSE.txt LICENSE-OFL-Terminus-Font.txt -t $(DATA_PREFIX)
+ install -m 644 data/changelog.txt data/cataicon.ico data/fontdata.json \
+ LICENSE.txt $(DATA_PREFIX)
+ LICENSE.txt LICENSE-OFL-Terminus-Font.txt $(DATA_PREFIX)
mkdir -p $(LOCALE_DIR)
ifdef LANGUAGES
LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
@@ -1055,11 +1047,6 @@ astyle: $(ASTYLED_WHITELIST)
astyle-all: $(SOURCES) $(HEADERS) $(TESTSRC) $(TESTHDR) $(TOOLSRC)
$(ASTYLE_BINARY) --options=.astylerc -n $(SOURCES) $(HEADERS)
$(ASTYLE_BINARY) --options=.astylerc -n $(TESTSRC) $(TESTHDR)
-
@@ -1074,11 +1067,6 @@ etags: $(ASTYLE_SOURCES)
astyle: $(ASTYLE_SOURCES)
$(ASTYLE_BINARY) --options=.astylerc -n $(ASTYLE_SOURCES)
-# Test whether the system has a version of astyle that supports --dry-run
-ifeq ($(shell if $(ASTYLE_BINARY) -Q -X --dry-run src/game.h > /dev/null; then echo foo; fi),foo)
- ASTYLE_CHECK=$(shell LC_ALL=C $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q $(ASTYLED_WHITELIST))
- ASTYLE_CHECK=$(shell LC_ALL=C $(ASTYLE_BINARY) --options=.astylerc --dry-run -X -Q $(ASTYLE_SOURCES))
-endif
-
astyle-check:
ifdef ASTYLE_CHECK
$(info $(ASTYLE_BINARY) -V: $(shell $(ASTYLE_BINARY) -V))
@@ -1121,7 +1109,7 @@ ifneq ($(CYGWIN),1)
@build-scripts/validate_pr_in_jenkins
endif
-.PHONY: tests check ctags etags clean-tests install lint validate-pr
+.PHONY: tests check ctags etags clean-tests install lint
-include $(SOURCES:$(SRC_DIR)/%.cpp=$(DEPDIR)/%.P)
-include ${OBJS:.o=.d}

14
games/cataclysm-dda/patches/patch-src_translations_cpp
View File

@ -1,14 +1,14 @@
$OpenBSD: patch-src_translations_cpp,v 1.4 2019/02/13 12:24:44 kirby Exp $
$OpenBSD: patch-src_translations_cpp,v 1.5 2020/04/11 06:41:47 kirby Exp $
Index: src/translations.cpp
--- src/translations.cpp.orig
+++ src/translations.cpp
@@ -195,7 +195,7 @@ void set_language()
@@ -212,7 +212,7 @@ void set_language()
auto env = getenv( "LANGUAGE" );
locale_dir = std::string( FILENAMES["base_path"] + "lang/mo/" + ( env ? env : "none" ) +
locale_dir = std::string( PATH_INFO::base_path() + "lang/mo/" + ( env ? env : "none" ) +
"/LC_MESSAGES/cataclysm-dda.mo" );
-#elif (defined __linux__ || (defined MACOSX && !defined TILES))
+#elif (defined __linux__ || defined __OpenBSD__ || (defined MACOSX && !defined TILES))
if( !FILENAMES["base_path"].empty() ) {
locale_dir = FILENAMES["base_path"] + "share/locale";
-#elif (defined(__linux__) || (defined(MACOSX) && !defined(TILES)))
+#elif (defined(__linux__) || defined(__OpenBSD__) || (defined(MACOSX) && !defined(TILES)))
if( !PATH_INFO::base_path().empty() ) {
locale_dir = PATH_INFO::base_path() + "share/locale";
} else {

110
games/cataclysm-dda/pkg/PFRAG.no-no_x11
View File

@ -1,11 +1,17 @@
@comment $OpenBSD: PFRAG.no-no_x11,v 1.5 2019/03/21 09:28:18 sthen Exp $
@comment $OpenBSD: PFRAG.no-no_x11,v 1.6 2020/04/11 06:41:47 kirby Exp $
@bin bin/cataclysm-tiles
@man man/man6/cataclysm-tiles.6
share/cataclysm-dda/gfx/
share/cataclysm-dda/gfx/BlockheadTileset/
share/cataclysm-dda/gfx/BlockheadTileset/blockheadtiles.png
share/cataclysm-dda/gfx/BlockheadTileset/tile_config.json
share/cataclysm-dda/gfx/BlockheadTileset/tileset.txt
share/cataclysm-dda/gfx/ASCIITileset/
share/cataclysm-dda/gfx/ASCIITileset/ASCIITiles.png
share/cataclysm-dda/gfx/ASCIITileset/fallback.png
share/cataclysm-dda/gfx/ASCIITileset/tile_config.json
share/cataclysm-dda/gfx/ASCIITileset/tileset.txt
share/cataclysm-dda/gfx/BrownLikeBears/
share/cataclysm-dda/gfx/BrownLikeBears/fallback.png
share/cataclysm-dda/gfx/BrownLikeBears/tile_config.json
share/cataclysm-dda/gfx/BrownLikeBears/tiles.png
share/cataclysm-dda/gfx/BrownLikeBears/tileset.txt
share/cataclysm-dda/gfx/ChestHole16Tileset/
share/cataclysm-dda/gfx/ChestHole16Tileset/fallback.png
share/cataclysm-dda/gfx/ChestHole16Tileset/tile_config.json
@ -13,30 +19,6 @@ share/cataclysm-dda/gfx/ChestHole16Tileset/tiles.png
share/cataclysm-dda/gfx/ChestHole16Tileset/tiles24.png
share/cataclysm-dda/gfx/ChestHole16Tileset/tileset.txt
share/cataclysm-dda/gfx/ChestHole16Tileset/tree.png
share/cataclysm-dda/gfx/ChestHole32Tileset/
share/cataclysm-dda/gfx/ChestHole32Tileset/fallback.png
share/cataclysm-dda/gfx/ChestHole32Tileset/tile_config.json
share/cataclysm-dda/gfx/ChestHole32Tileset/tiles.png
share/cataclysm-dda/gfx/ChestHole32Tileset/tiles48.png
share/cataclysm-dda/gfx/ChestHole32Tileset/tileset.txt
share/cataclysm-dda/gfx/ChestHole32Tileset/tree.png
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/fallback.png
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tile_config.json
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tiles.png
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tiles48.png
share/cataclysm-dda/gfx/ChestHole32Tileset_iso/tileset.txt
share/cataclysm-dda/gfx/ChestHoleTileset/
share/cataclysm-dda/gfx/ChestHoleTileset/fallback.png
share/cataclysm-dda/gfx/ChestHoleTileset/tile_config.json
share/cataclysm-dda/gfx/ChestHoleTileset/tiles.png
share/cataclysm-dda/gfx/ChestHoleTileset/tiles32.png
share/cataclysm-dda/gfx/ChestHoleTileset/tileset.txt
share/cataclysm-dda/gfx/ChestHoleTileset/tree.png
share/cataclysm-dda/gfx/DeonTileset/
share/cataclysm-dda/gfx/DeonTileset/deontiles.png
share/cataclysm-dda/gfx/DeonTileset/tile_config.json
share/cataclysm-dda/gfx/DeonTileset/tileset.txt
share/cataclysm-dda/gfx/HitButton_iso/
share/cataclysm-dda/gfx/HitButton_iso/HitButton_iso.png
share/cataclysm-dda/gfx/HitButton_iso/fallback.png
@ -48,64 +30,30 @@ share/cataclysm-dda/gfx/HoderTileset/hodertiles_fallback.png
share/cataclysm-dda/gfx/HoderTileset/hodertiles_oversized.png
share/cataclysm-dda/gfx/HoderTileset/tile_config.json
share/cataclysm-dda/gfx/HoderTileset/tileset.txt
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/10_xfiles_32x32_22052-22195.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/11_tiles_kawaiimaidmod_32x32_22196-22291.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/12_tiles_kawaiimaidmod_offset_32x32_22292-22339.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/13_tiles_kawaiimaidmod_64x48-22340-22364.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/14_tiles2_32x32_22365-27564.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/15_tiles-connected_variants_32x32_27565-32764.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/16_tiles_trees_64x80_32765-33164.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/17_top_hats_32x32-33165-35756.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/1_tiles_32x32_0-5199.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/2_expan_32x32_5200-5391.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/3_tree_64x80_5392-5471.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/4_fallback_5472-9567.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/5_tiles_character_customization_32x32_9568-11567.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/6_tiles_wide_monsters_160x128_11568-11603.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/7_expan2_32x32_11604-11651.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/8_tiles-monster-variants_32x32_11652-16851.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/9_tiles-connected_32x32_16852-22051.png
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tile_config.json
share/cataclysm-dda/gfx/MSX++DeadPeopleEdition/tileset.txt
share/cataclysm-dda/gfx/MShock24TilesetModded/
share/cataclysm-dda/gfx/MShock24TilesetModded/fallback.png
share/cataclysm-dda/gfx/MShock24TilesetModded/tile_config.json
share/cataclysm-dda/gfx/MShock24TilesetModded/tiles.png
share/cataclysm-dda/gfx/MShock24TilesetModded/tileset.txt
share/cataclysm-dda/gfx/MShock32TilesetModded/
share/cataclysm-dda/gfx/MShock32TilesetModded/fallback.png
share/cataclysm-dda/gfx/MShock32TilesetModded/tile_config.json
share/cataclysm-dda/gfx/MShock32TilesetModded/tiles.png
share/cataclysm-dda/gfx/MShock32TilesetModded/tileset.txt
share/cataclysm-dda/gfx/MshockXotto+/
share/cataclysm-dda/gfx/MshockXotto+/expan.png
share/cataclysm-dda/gfx/MshockXotto+/expan2.png
share/cataclysm-dda/gfx/MshockXotto+/fallback.png
share/cataclysm-dda/gfx/MshockXotto+/tile_config.json
share/cataclysm-dda/gfx/MshockXotto+/tiles.png
share/cataclysm-dda/gfx/MshockXotto+/tileset.txt
share/cataclysm-dda/gfx/MshockXotto+/tree.png
share/cataclysm-dda/gfx/MshockXotto+/treeO.png
share/cataclysm-dda/gfx/RetroASCIITileset/
share/cataclysm-dda/gfx/RetroASCIITileset/fallback.png
share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png
share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json
share/cataclysm-dda/gfx/RetroASCIITileset/tileset.txt
share/cataclysm-dda/gfx/RetroDaysTileset/
share/cataclysm-dda/gfx/RetroDaysTileset/fallback.png
share/cataclysm-dda/gfx/RetroDaysTileset/tile_config.json
share/cataclysm-dda/gfx/RetroDaysTileset/tiles.png
share/cataclysm-dda/gfx/RetroDaysTileset/tiles_20x20.png
share/cataclysm-dda/gfx/RetroDaysTileset/tileset.txt
share/cataclysm-dda/gfx/ThuztorTileset@/
share/cataclysm-dda/gfx/ThuztorTileset@/thuztortiles@.png
share/cataclysm-dda/gfx/ThuztorTileset@/tile_config.json
share/cataclysm-dda/gfx/ThuztorTileset@/tileset.txt
share/cataclysm-dda/gfx/TsuTileset/
share/cataclysm-dda/gfx/TsuTileset/tile_config.json
share/cataclysm-dda/gfx/TsuTileset/tileset.txt
share/cataclysm-dda/gfx/TsuTileset/tsutiles.png
share/cataclysm-dda/gfx/RetroDays+Tileset/
share/cataclysm-dda/gfx/RetroDays+Tileset/fallback.png
share/cataclysm-dda/gfx/RetroDays+Tileset/tile_config.json
share/cataclysm-dda/gfx/RetroDays+Tileset/tiles.png
share/cataclysm-dda/gfx/RetroDays+Tileset/tiles_20x20.png
share/cataclysm-dda/gfx/RetroDays+Tileset/tileset.txt
share/cataclysm-dda/gfx/UltimateCataclysmDemo/
share/cataclysm-dda/gfx/UltimateCataclysmDemo/fallback.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/fillerhoder.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/giant.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/huge.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/incomplete.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/large.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/normal.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/opengameartgiant.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/tall.png
share/cataclysm-dda/gfx/UltimateCataclysmDemo/tile_config.json
share/cataclysm-dda/gfx/UltimateCataclysmDemo/tileset.txt
share/cataclysm-dda/gfx/tile_config.json
share/cataclysm-dda/gfx/tile_config_template.json
share/cataclysm-dda/gfx/tinytile.png

1869
games/cataclysm-dda/pkg/PLIST
View File

File diff suppressed because it is too large Load Diff