cataclysm-dda: update to 0.F.2

Point release Frank-2 includes following bugfixes backported to original
Frank release:

* 50877 Catch SecurityException in SDL getSerialNumber
* 50452 Fix dropping worn items from AIM
* 50814 Prevent endless loop during butchering
* 51035 Resolve a bug in partial stack dropping/using and unify ui behaviour
* 51147 Fix crash resulting from NPC activity migration (loading 0.F saves)

4 files changed, 16 insertions, 12 deletions

diff --git a/games/cataclysm-dda-sdl/PLIST b/games/cataclysm-dda-sdl/PLIST
index e630ad4d477..055a099e3ef 100644
--- a/games/cataclysm-dda-sdl/PLIST
+++ b/games/cataclysm-dda-sdl/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/07/12 20:54:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/09/03 11:38:36 nia Exp $
 bin/cataclysm-tiles
 share/appdata/org.cataclysmdda.CataclysmDDA.appdata.xml
 share/applications/org.cataclysmdda.CataclysmDDA.desktop
@@ -246,6 +246,7 @@ share/cataclysm-dda/json/itemgroups/SUS/evac_shelter.json
 share/cataclysm-dda/json/itemgroups/SUS/fridges.json
 share/cataclysm-dda/json/itemgroups/SUS/garage.json
 share/cataclysm-dda/json/itemgroups/SUS/library.json
+share/cataclysm-dda/json/itemgroups/SUS/mre_packages.json
 share/cataclysm-dda/json/itemgroups/SUS/office.json
 share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/ammo.json
 share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
@@ -1333,6 +1334,7 @@ share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b2.json
 share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b3.json
 share/cataclysm-dda/json/mapgen_palettes/office.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/orchard_apple.json
 share/cataclysm-dda/json/mapgen_palettes/park_palette.json
 share/cataclysm-dda/json/mapgen_palettes/prison.json
 share/cataclysm-dda/json/mapgen_palettes/private_resort.json
@@ -1820,7 +1822,6 @@ share/cataclysm-dda/json/recipes/other/vehicle.json
 share/cataclysm-dda/json/recipes/recipe_ammo.json
 share/cataclysm-dda/json/recipes/recipe_companion.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction.json
-share/cataclysm-dda/json/recipes/recipe_deconstruction_package.json
 share/cataclysm-dda/json/recipes/recipe_food.json
 share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
 share/cataclysm-dda/json/recipes/recipe_obsolete.json
@@ -2634,6 +2635,7 @@ share/cataclysm-dda/mods/Magiclysm/items/spell_scrolls.json
 share/cataclysm-dda/mods/Magiclysm/items/spellbooks.json
 share/cataclysm-dda/mods/Magiclysm/items/tools.json
 share/cataclysm-dda/mods/Magiclysm/items/vehicle/frames.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle/vehicle_parts.json
 share/cataclysm-dda/mods/Magiclysm/items/vehicle_parts.json
 share/cataclysm-dda/mods/Magiclysm/items/weapons.json
 share/cataclysm-dda/mods/Magiclysm/lore.md
diff --git a/games/cataclysm-dda/Makefile.common b/games/cataclysm-dda/Makefile.common
index ae1c5b43e07..95e22bf7e57 100644
--- a/games/cataclysm-dda/Makefile.common
+++ b/games/cataclysm-dda/Makefile.common
@@ -1,12 +1,12 @@
-# $NetBSD: Makefile.common,v 1.6 2021/07/12 20:54:02 nia Exp $
+# $NetBSD: Makefile.common,v 1.7 2021/09/03 11:38:36 nia Exp $
 # used by games/cataclysm-dda/Makefile
 # used by games/cataclysm-dda-sdl/Makefile
 
-DISTNAME=	cataclysm-dda-0.F
+DISTNAME=	cataclysm-dda-0.F.2
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=CleverRaven/}
 GITHUB_PROJECT=	Cataclysm-DDA
-GITHUB_TAG=	0.F
+GITHUB_TAG=	0.F-2
 
 HOMEPAGE=	https://cataclysmdda.org/
 LICENSE=	cc-by-sa-v3.0
diff --git a/games/cataclysm-dda/PLIST b/games/cataclysm-dda/PLIST
index 26c987faf50..72c7aae103c 100644
--- a/games/cataclysm-dda/PLIST
+++ b/games/cataclysm-dda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2021/07/12 20:54:02 nia Exp $
+@comment $NetBSD: PLIST,v 1.4 2021/09/03 11:38:36 nia Exp $
 bin/cataclysm
 share/cataclysm-dda/LICENSE.txt
 share/cataclysm-dda/cataicon.ico
@@ -129,6 +129,7 @@ share/cataclysm-dda/json/itemgroups/SUS/evac_shelter.json
 share/cataclysm-dda/json/itemgroups/SUS/fridges.json
 share/cataclysm-dda/json/itemgroups/SUS/garage.json
 share/cataclysm-dda/json/itemgroups/SUS/library.json
+share/cataclysm-dda/json/itemgroups/SUS/mre_packages.json
 share/cataclysm-dda/json/itemgroups/SUS/office.json
 share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/ammo.json
 share/cataclysm-dda/json/itemgroups/Weapons_Mods_Ammo/gunmod.json
@@ -1216,6 +1217,7 @@ share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b2.json
 share/cataclysm-dda/json/mapgen_palettes/necropolis/necropolis_b3.json
 share/cataclysm-dda/json/mapgen_palettes/office.json
 share/cataclysm-dda/json/mapgen_palettes/office_doctor.json
+share/cataclysm-dda/json/mapgen_palettes/orchard_apple.json
 share/cataclysm-dda/json/mapgen_palettes/park_palette.json
 share/cataclysm-dda/json/mapgen_palettes/prison.json
 share/cataclysm-dda/json/mapgen_palettes/private_resort.json
@@ -1703,7 +1705,6 @@ share/cataclysm-dda/json/recipes/other/vehicle.json
 share/cataclysm-dda/json/recipes/recipe_ammo.json
 share/cataclysm-dda/json/recipes/recipe_companion.json
 share/cataclysm-dda/json/recipes/recipe_deconstruction.json
-share/cataclysm-dda/json/recipes/recipe_deconstruction_package.json
 share/cataclysm-dda/json/recipes/recipe_food.json
 share/cataclysm-dda/json/recipes/recipe_medsandchemicals.json
 share/cataclysm-dda/json/recipes/recipe_obsolete.json
@@ -2517,6 +2518,7 @@ share/cataclysm-dda/mods/Magiclysm/items/spell_scrolls.json
 share/cataclysm-dda/mods/Magiclysm/items/spellbooks.json
 share/cataclysm-dda/mods/Magiclysm/items/tools.json
 share/cataclysm-dda/mods/Magiclysm/items/vehicle/frames.json
+share/cataclysm-dda/mods/Magiclysm/items/vehicle/vehicle_parts.json
 share/cataclysm-dda/mods/Magiclysm/items/vehicle_parts.json
 share/cataclysm-dda/mods/Magiclysm/items/weapons.json
 share/cataclysm-dda/mods/Magiclysm/lore.md
diff --git a/games/cataclysm-dda/distinfo b/games/cataclysm-dda/distinfo
index dc48ef1057c..5109db9b7ef 100644
--- a/games/cataclysm-dda/distinfo
+++ b/games/cataclysm-dda/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.5 2021/07/12 20:54:02 nia Exp $
+$NetBSD: distinfo,v 1.6 2021/09/03 11:38:36 nia Exp $
 
-SHA1 (cataclysm-dda-0.F.tar.gz) = 59865f66e9bf46954d30d85c063f2c570341220b
-RMD160 (cataclysm-dda-0.F.tar.gz) = 770001ee2f64737f11d852dc337aa17139b04826
-SHA512 (cataclysm-dda-0.F.tar.gz) = 9dd32f6fda936b77007a1f0e3fca85c25c3c87f41819fa55b0c454c2cc756664a688c910bd981bc1ba14859401d0d8eebd1515d1b9d4a34d6ffe0303e699eb0b
-Size (cataclysm-dda-0.F.tar.gz) = 88591910 bytes
+SHA1 (cataclysm-dda-0.F.2.tar.gz) = d436b0e0dbbae47e6f40c8201c56391edddd5564
+RMD160 (cataclysm-dda-0.F.2.tar.gz) = 46f9caf52ab312d770e20a7d5f94ced1a4fd630e
+SHA512 (cataclysm-dda-0.F.2.tar.gz) = 31425be7381815462aff48c08c89f02734bb3caff70e151b1b9fe0f5fd2e1a9ae5dbcfab6910dd2ea7788cbecd21db4f89757c07d5fb72538c531b64e6f9bde3
+Size (cataclysm-dda-0.F.2.tar.gz) = 88597127 bytes
 SHA1 (patch-Makefile) = cee0c0e1a6293b5beafe06fe2282d469bcd995a2
 SHA1 (patch-lang_compile__mo.sh) = 1a2e65a5f5a5b8c4f56ceb9ddc8e3383856fac57
 SHA1 (patch-src_translations.cpp) = 90d55c1b526bcf44c8b0c902ac2c4df5c87ba68f