angband[-sdl]: update to 4.2.4

Summary of Changes

    use C99 types instead of the angband special types
    Single Combat maybe finally bug-free
    improvements to the birth process
    improvements to the NDS port
    many improvements to auto-building and all the front ends
    improvements to changing of background colours
    adding of a panic directory for panic saves
    new tests, and improvements to current ones
    re-organisation of effects code
    add a player argument to a lot of functions that needed it
    import a lot of historical documentation
    lots of tidying and neatening

5 files changed, 46 insertions, 13 deletions

diff --git a/games/angband-sdl/PLIST b/games/angband-sdl/PLIST
index 3f5d6077094..cf06b765786 100644
--- a/games/angband-sdl/PLIST
+++ b/games/angband-sdl/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2020/07/07 13:17:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/05/15 18:54:44 nia Exp $
 bin/angband
 share/angband/customize/font-gcu.prf
 share/angband/customize/font-sdl.prf
+share/angband/customize/font-sdl2.prf
 share/angband/customize/font-win.prf
 share/angband/customize/font-x11.prf
 share/angband/customize/font.prf
@@ -77,6 +78,8 @@ share/angband/gamedata/visuals.txt
 share/angband/gamedata/world.txt
 share/angband/help/commands.txt
 share/angband/help/index.txt
+share/angband/help/r_comm.txt
+share/angband/help/r_index.txt
 share/angband/help/symbols.txt
 share/angband/icons/att-128.png
 share/angband/icons/att-16.png
diff --git a/games/angband/Makefile.common b/games/angband/Makefile.common
index 95c8ef8e82f..caa9b719574 100644
--- a/games/angband/Makefile.common
+++ b/games/angband/Makefile.common
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile.common,v 1.4 2021/11/09 11:32:39 nia Exp $
+# $NetBSD: Makefile.common,v 1.5 2022/05/15 18:54:44 nia Exp $
 # used by games/angband-sdl/Makefile
 # used by games/angband/Makefile
 
-DISTNAME=	angband-4.2.3
+DISTNAME=	angband-4.2.4
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=angband/}
 GITHUB_PROJECT=	angband
diff --git a/games/angband/PLIST b/games/angband/PLIST
index c3d24777ccd..dfc8cfadd8c 100644
--- a/games/angband/PLIST
+++ b/games/angband/PLIST
@@ -1,7 +1,8 @@
-@comment $NetBSD: PLIST,v 1.2 2020/07/07 13:17:46 nia Exp $
+@comment $NetBSD: PLIST,v 1.3 2022/05/15 18:54:44 nia Exp $
 bin/angband
 share/angband/customize/font-gcu.prf
 share/angband/customize/font-sdl.prf
+share/angband/customize/font-sdl2.prf
 share/angband/customize/font-win.prf
 share/angband/customize/font-x11.prf
 share/angband/customize/font.prf
@@ -55,6 +56,8 @@ share/angband/gamedata/visuals.txt
 share/angband/gamedata/world.txt
 share/angband/help/commands.txt
 share/angband/help/index.txt
+share/angband/help/r_comm.txt
+share/angband/help/r_index.txt
 share/angband/help/symbols.txt
 share/angband/screens/crown.txt
 share/angband/screens/dead.txt
diff --git a/games/angband/distinfo b/games/angband/distinfo
index a96de8735b0..cac5658c863 100644
--- a/games/angband/distinfo
+++ b/games/angband/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:43:46 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/05/15 18:54:44 nia Exp $
 
-BLAKE2s (angband-4.2.3.tar.gz) = 88be318c246aa8d78288dc449415a4608e2c1aee8ca8910279a692d1e7bcba88
-SHA512 (angband-4.2.3.tar.gz) = f80a16c40d877c50194be370795acb437778ca88a658a8c95bef637625ab8a88ceb98f45d742e698709b6c81e8b5de6f563f88e957cd71eca208673bb4179e88
-Size (angband-4.2.3.tar.gz) = 25175745 bytes
-SHA1 (patch-configure.ac) = 328bd6a1bd0fa3481f2fd4081e34ec7d025802d8
+BLAKE2s (angband-4.2.4.tar.gz) = b811bf0b23862cccc0c383bffdd96332bcf3250793e8dd2f2c65b3730c2b176c
+SHA512 (angband-4.2.4.tar.gz) = 5b47cfa95f779aa3f1e89f02f203b8eafd2dc1376b7aab1b62e37122fb83640d1de25f39817863a74c246d7de35bb3f26868f5f5e8906e92788a6dd74a85a4c5
+Size (angband-4.2.4.tar.gz) = 25271611 bytes
+SHA1 (patch-configure.ac) = 35fbcd77734bf9dfb6c9d5c6dc9d82bca2343ebb
 SHA1 (patch-lib_icons_angband-sdl.desktop) = d1dffae7e39adc447eb1542434dca08ce0a7c6b0
diff --git a/games/angband/patches/patch-configure.ac b/games/angband/patches/patch-configure.ac
index 849a13c977b..de0448d87fe 100644
--- a/games/angband/patches/patch-configure.ac
+++ b/games/angband/patches/patch-configure.ac
@@ -1,15 +1,42 @@
-$NetBSD: patch-configure.ac,v 1.1 2021/08/31 08:23:15 nia Exp $
+$NetBSD: patch-configure.ac,v 1.2 2022/05/15 18:54:44 nia Exp $
 
 Shell portability.
 
---- configure.ac.orig	2021-07-31 22:28:01.000000000 +0000
+--- configure.ac.orig	2022-02-21 22:18:55.000000000 +0000
 +++ configure.ac
-@@ -217,7 +217,7 @@ AC_DEFINE_UNQUOTED([DEFAULT_DATA_PATH], 
+@@ -238,7 +238,7 @@ AC_ARG_WITH(gamedata_in_lib,
+ 	[AS_HELP_STRING([--with-gamedata-in-lib], [store the game data in the lib path.])])
  
- NOINSTALL="$with_noinstall"; AC_SUBST(NOINSTALL)
+ GAMEDATA_IN_LIB="false"
+-if test "x$with_gamedata_in_lib" == "xyes"; then
++if test "x$with_gamedata_in_lib" = "xyes"; then
+ 	GAMEDATA_IN_LIB="true"
+ 	AC_DEFINE(GAMEDATA_IN_LIB, 1, [Define to store the game data in the lib path.])
+ fi
+@@ -256,7 +256,7 @@ AC_DEFINE_UNQUOTED([DEFAULT_DATA_PATH], 
+ 
+ NOINSTALL="$with_no_install"; AC_SUBST(NOINSTALL)
  SETEGID="$with_setgid";      AC_SUBST(SETEGID)
 -if test "x$wsetgid" == "xyes"; then
 +if test "x$wsetgid" = "xyes"; then
  	AC_DEFINE(SETGID, 1, [Define if running as a central install on a multiuser system that has setresgid or setegid support.])
  fi
  
+@@ -572,7 +572,7 @@ echo "  config path:                    
+ echo "  lib path:                               ${displayedlibdatadir}"
+ echo "  doc path:                               ${displayeddocdir}"
+ echo "  var path:                               ${displayedvardatadir}"
+-if test "x$with_gamedata_in_lib" == "xyes"; then
++if test "x$with_gamedata_in_lib" = "xyes"; then
+ 	echo "  gamedata path:                          ${displayedlibdatadir}"
+ else
+ 	echo "  gamedata path:                          ${displayedconfigdir}"
+@@ -582,7 +582,7 @@ if test "x$wsetgid" = "xyes"; then
+ elif test "x$with_private_dirs" = "xyes" && test ! "x$enable_win" = "xyes"; then
+ 	echo "  (with private save and score files in ~/.angband/Angband/)"
+ fi
+-if test "x$with_sphinx" == "xyes"; then
++if test "x$with_sphinx" = "xyes"; then
+ 	echo "  documentation:                          Yes"
+ else
+ 	echo "  documentation:                          No"