[UPDATE] games/cataclysm-dda to 20180201

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[UPDATE] games/cataclysm-dda to 20180201

trondd-2
Update Cataclysm DDA to development as of 2018-02-01.

Tim.


Index: Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 Makefile
--- Makefile 27 Dec 2017 22:00:17 -0000 1.3
+++ Makefile 5 Mar 2018 00:23:51 -0000
@@ -1,12 +1,12 @@
 # $OpenBSD: Makefile,v 1.3 2017/12/27 22:00:17 bcallah Exp $
 
 COMMENT= rogue-like zombie survival game
-DISTNAME= cataclysm-dda-2017.12.14
+DISTNAME= cataclysm-dda-2018.02.01
 CATEGORIES= games
 
 GH_ACCOUNT= CleverRaven
 GH_PROJECT= Cataclysm-DDA
-GH_COMMIT= a2cff93463812d7d318c23db864cad7dfef992bd
+GH_COMMIT= cf64a8836391ba742ce1eca500e1e0409a654d83
 
 HOMEPAGE= http://en.cataclysmdda.com
 MAINTAINER= Tim Meunier <[hidden email]>
Index: distinfo
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/distinfo,v
retrieving revision 1.2
diff -u -p -r1.2 distinfo
--- distinfo 27 Dec 2017 22:00:17 -0000 1.2
+++ distinfo 5 Mar 2018 00:23:51 -0000
@@ -1,2 +1,2 @@
-SHA256 (cataclysm-dda-2017.12.14-a2cff934.tar.gz) = ZWERVchcr/nYXdtKV2j9T1lExnlP1mte4lTut00IzqI=
-SIZE (cataclysm-dda-2017.12.14-a2cff934.tar.gz) = 55792459
+SHA256 (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = PqoXPbvHznM8ezzgbiejZZ7xuyzhI+iyWlBB7bXgHTk=
+SIZE (cataclysm-dda-2018.02.01-cf64a883.tar.gz) = 60095165
Index: patches/patch-Makefile
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/patches/patch-Makefile,v
retrieving revision 1.3
diff -u -p -r1.3 patch-Makefile
--- patches/patch-Makefile 27 Dec 2017 22:00:17 -0000 1.3
+++ patches/patch-Makefile 5 Mar 2018 00:23:51 -0000
@@ -49,7 +49,7 @@ Index: Makefile
  PKG_CONFIG = $(CROSS)pkg-config
  SDL2_CONFIG = $(CROSS)sdl2-config
 
-@@ -706,7 +699,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
+@@ -716,7 +709,6 @@ $(BUILD_PREFIX)$(TARGET_NAME).a: $(ODIR) $(OBJS)
  .PHONY: version json-verify
  version:
  @( VERSION_STRING=$(VERSION) ; \
@@ -57,7 +57,7 @@ Index: Makefile
              [ -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 \
           )
-@@ -760,35 +752,35 @@ distclean:
+@@ -770,35 +762,35 @@ distclean:
  bindist: $(BINDIST)
 
  ifeq ($(TARGETSYSTEM), LINUX)
@@ -112,7 +112,7 @@ Index: Makefile
  mkdir -p $(LOCALE_DIR)
  ifdef LANGUAGES
  LOCALE_DIR=$(LOCALE_DIR) lang/compile_mo.sh $(LANGUAGES)
-@@ -956,11 +948,6 @@ astyle: $(ASTYLED_WHITELIST)
+@@ -966,11 +958,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)
Index: pkg/PFRAG.no-no_x11
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PFRAG.no-no_x11,v
retrieving revision 1.1.1.1
diff -u -p -r1.1.1.1 PFRAG.no-no_x11
--- pkg/PFRAG.no-no_x11 29 Oct 2017 17:27:19 -0000 1.1.1.1
+++ pkg/PFRAG.no-no_x11 5 Mar 2018 00:23:51 -0000
@@ -56,6 +56,13 @@ share/cataclysm-dda/gfx/MShock32TilesetM
 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+/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/RetroASCIITileset/
 share/cataclysm-dda/gfx/RetroASCIITileset/retroasciitiles.png
 share/cataclysm-dda/gfx/RetroASCIITileset/tile_config.json
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/games/cataclysm-dda/pkg/PLIST,v
retrieving revision 1.2
diff -u -p -r1.2 PLIST
--- pkg/PLIST 27 Dec 2017 22:00:17 -0000 1.2
+++ pkg/PLIST 5 Mar 2018 00:23:52 -0000
@@ -345,6 +345,8 @@ share/cataclysm-dda/json/mapgen/hardware
 share/cataclysm-dda/json/mapgen/hardware4.json
 share/cataclysm-dda/json/mapgen/homeimprovement.json
 share/cataclysm-dda/json/mapgen/homeimprovement_superstore.json
+share/cataclysm-dda/json/mapgen/hospital/
+share/cataclysm-dda/json/mapgen/hospital/hospital.json
 share/cataclysm-dda/json/mapgen/hotel_tower.json
 share/cataclysm-dda/json/mapgen/house/
 share/cataclysm-dda/json/mapgen/house/house04.json
@@ -458,8 +460,19 @@ share/cataclysm-dda/json/mapgen/s_liquor
 share/cataclysm-dda/json/mapgen/sai.json
 share/cataclysm-dda/json/mapgen/school_1.json
 share/cataclysm-dda/json/mapgen/shelter.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/
+share/cataclysm-dda/json/mapgen/small_town_buildings/bakery.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/candy_shop.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/construction_site.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/icecream_shop.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_0.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_0_1.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_0.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/lumberyard_1_1.json
+share/cataclysm-dda/json/mapgen/small_town_buildings/post_office.json
 share/cataclysm-dda/json/mapgen/standing_stones.json
 share/cataclysm-dda/json/mapgen/sub_station.json
+share/cataclysm-dda/json/mapgen/subway_tunnels.json
 share/cataclysm-dda/json/mapgen/sugar_house.json
 share/cataclysm-dda/json/mapgen/swamp_shack.json
 share/cataclysm-dda/json/mapgen/teashop.json
@@ -469,9 +482,12 @@ share/cataclysm-dda/json/mapgen/warehous
 share/cataclysm-dda/json/mapgen_palettes/
 share/cataclysm-dda/json/mapgen_palettes/basement.json
 share/cataclysm-dda/json/mapgen_palettes/church.json
+share/cataclysm-dda/json/mapgen_palettes/hospital.json
 share/cataclysm-dda/json/mapgen_palettes/houses_multistory.json
+share/cataclysm-dda/json/mapgen_palettes/lumberyard.json
 share/cataclysm-dda/json/mapgen_palettes/mansion.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/subway.json
 share/cataclysm-dda/json/martialarts.json
 share/cataclysm-dda/json/materials.json
 share/cataclysm-dda/json/monster_attacks.json
@@ -1628,6 +1644,7 @@ share/cataclysm-dda/mods/More_Survival_T
 share/cataclysm-dda/mods/More_Survival_Tools/ammo_types.json
 share/cataclysm-dda/mods/More_Survival_Tools/armor.json
 share/cataclysm-dda/mods/More_Survival_Tools/construction.json
+share/cataclysm-dda/mods/More_Survival_Tools/effects.json
 share/cataclysm-dda/mods/More_Survival_Tools/furniture.json
 share/cataclysm-dda/mods/More_Survival_Tools/item_groups.json
 share/cataclysm-dda/mods/More_Survival_Tools/items.json
@@ -1641,6 +1658,13 @@ share/cataclysm-dda/mods/More_Survival_T
 share/cataclysm-dda/mods/More_Survival_Tools/traps.json
 share/cataclysm-dda/mods/Mundane_Zombies/
 share/cataclysm-dda/mods/Mundane_Zombies/modinfo.json
+share/cataclysm-dda/mods/Mutant_NPCs/
+share/cataclysm-dda/mods/Mutant_NPCs/modinfo.json
+share/cataclysm-dda/mods/Mutant_NPCs/npc_classes_mutant.json
+share/cataclysm-dda/mods/NPC_Traits/
+share/cataclysm-dda/mods/NPC_Traits/modinfo.json
+share/cataclysm-dda/mods/NPC_Traits/npc_classes.json
+share/cataclysm-dda/mods/NPC_Traits/trait_groups.json
 share/cataclysm-dda/mods/NW_Pack/
 share/cataclysm-dda/mods/NW_Pack/modinfo.json
 share/cataclysm-dda/mods/NW_Pack/nw_archery.json