3 files changed, 327 insertions, 5 deletions
diff --git a/games/hatari/hatari.SlackBuild b/games/hatari/hatari.SlackBuild
index aad63b65a6..9f0904c9ca 100644
--- a/games/hatari/hatari.SlackBuild
+++ b/games/hatari/hatari.SlackBuild
@@ -6,6 +6,7 @@
 
 # Licensed under the WTFPL. See http://www.wtfpl.net/txt/copying/ for details.
 
+# 20210102 bkw: update for v2.3.1.
 # 20201218 bkw:
 # - update for v2.3.0. Can't build older versions, sorry.
 # - add new dep, python3.
@@ -63,7 +64,7 @@
 # - add mime type and auto-associate ST disk images and executables.
 
 PRGNAM=hatari
-VERSION=${VERSION:-2.3.0}
+VERSION=${VERSION:-2.3.1}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -114,7 +115,9 @@ patch -p1 < $CWD/hatariui-create-cfg-if-missing.diff
 
 # Man pages go in section 6, fix .TH and see-also refs. Also fix a few
 # typos and formatting issues.
-patch -p1 < $CWD/manpage.diff
+P="$CWD/manpage.$VERSION.diff"
+[ -e "$P" ] || P="$CWD/manpage.diff"
+patch -p1 < $P
 
 # cmake doesn't support anything like --bindir, --mandir, --docdir. cheat
 # a little.
diff --git a/games/hatari/hatari.info b/games/hatari/hatari.info
index 0b25abe8c2..cce88a2cd4 100644
--- a/games/hatari/hatari.info
+++ b/games/hatari/hatari.info
@@ -1,8 +1,8 @@
 PRGNAM="hatari"
-VERSION="2.3.0"
+VERSION="2.3.1"
 HOMEPAGE="http://hatari.tuxfamily.org/"
-DOWNLOAD="http://download.tuxfamily.org/hatari/2.3.0/hatari-2.3.0.tar.bz2"
-MD5SUM="eefd32d63ad0d264f51406f2e7009e23"
+DOWNLOAD="http://download.tuxfamily.org/hatari/2.3.1/hatari-2.3.1.tar.bz2"
+MD5SUM="52f572328edc575db17e54d4fd2d3a20"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="python3"
diff --git a/games/hatari/manpage.2.3.1.diff b/games/hatari/manpage.2.3.1.diff
new file mode 100644
index 0000000000..50629bd64e
--- /dev/null
+++ b/games/hatari/manpage.2.3.1.diff
@@ -0,0 +1,319 @@
+diff -Naur hatari-2.3.0/doc/fr/hatari.1 hatari-2.3.0.patched/doc/fr/hatari.1
+--- hatari-2.3.0/doc/fr/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/fr/hatari.1	2020-12-19 00:50:09.455505119 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI" "1" "2008-03-14" "Hatari" ""
++.TH "HATARI" "6" "2008-03-14" "Hatari" ""
+ .\" Please adjust this date whenever revising the manpage.
+ 
+ .SH "NAME"
+diff -Naur hatari-2.3.0/doc/hatari.1 hatari-2.3.0.patched/doc/hatari.1
+--- hatari-2.3.0/doc/hatari.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/doc/hatari.1	2020-12-19 00:49:56.399506306 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI" "1" "2020-11-27" "Hatari" ""
++.TH "HATARI" "6" "2020-12-18" "Hatari" ""
+ .\" Please adjust this date whenever revising the manpage.
+ 
+ .SH "NAME"
+@@ -668,7 +668,9 @@
+ will act as
+ .B Alternate
+ as well as long as you do not press it together with a Hatari hotkey
+-combination.
++combination. Note to US keyboard layout users: if you don't have an
++.B AltGr
++key on your keyboard, use the right Alt key.
+ .PP
+ The
+ .B right Ctrl
+@@ -788,40 +790,49 @@
+ .PP
+ Other Hatari programs and utilities:
+ .br
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatariui (1),
+-.IR hconsole (1),
+-.IR gst2ascii (1),
+-.IR hatari_profile (1)
++.IR hmsa (6),
++.IR zip2st (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatariui (6),
++.IR hconsole (6),
++.IR gst2ascii (6),
++.IR hatari_profile (6)
+ 
+ .SH "FILES AND DIRECTORIES"
+ .TP
+-/etc/hatari.cfg (or /usr/local/etc/hatari.cfg)
++/etc/hatari.cfg
+ The global configuration file of Hatari.
+ .TP
+ ~/.config/hatari/
+ The (default) directory for user's personal Hatari files;
+-.B hatari.cfg
++.RS 2
++.TP
++hatari.cfg
+ (configuration file),
+-.B hatari.nvram
++.TP
++hatari.nvram
+ (NVRAM content file),
+-.B hatari.sav
++.TP
++hatari.sav
+ (Hatari memory state snapshot file which Hatari can load/save automatically
+ when it starts/exits),
+-.B hatari.prn
++.TP
++hatari.prn
+ (printer output file),
++.RE
+ .TP
+-/usr/share/hatari/ (or /usr/local/share/hatari/)
++/usr/share/hatari/
+ The global data directory of Hatari.
++.RS 2
+ .TP
+ tos.img
+ The TOS ROM image will be loaded from the data directory of Hatari unless it
+ is specified on the command line or the configuration file.
++.RE
+ 
+ .SH "AUTHOR"
+ This manual page was written by Marco Herrn <marco@mherrn.de> for the
+ Debian project and later modified by Thomas Huth and Eero Tamminen to
+-suit the latest version of Hatari.
++suit the latest version of Hatari. Later it was modified by B. Watson
++<yalhcru@gmail.com> for the SlackBuilds.org project to fix some formatting.
+diff -Naur hatari-2.3.0/python-ui/hatariui.1 hatari-2.3.0.patched/python-ui/hatariui.1
+--- hatari-2.3.0/python-ui/hatariui.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/python-ui/hatariui.1	2020-12-19 00:50:20.615504105 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "hatariui" "1" "2020-12-15" "Hatari" "Hatari UI"
++.TH "HATARIUI" "6" "2020-12-15" "Hatari" "Hatari UI"
+ .SH "NAME"
+ hatariui \- Python/Gtk UI for Hatari
+ .SH "SYNOPSIS"
+@@ -211,9 +211,9 @@
+ For more examples on Hatari UI options usage, see the hatariui shell
+ script.
+ .SH "SEE ALSO"
+-.IR hmsa (1),
+-.IR hatariui (1),
+-.IR hconsole (1)
++.IR hmsa (6),
++.IR hatariui (6),
++.IR hconsole (6)
+ .SH "COPYRIGHT"
+ Hatari UI is written by Eero Tamminen <oak at helsinkinet fi>.
+ .PP
+diff -Naur hatari-2.3.0/tools/atari-convert-dir.1 hatari-2.3.0.patched/tools/atari-convert-dir.1
+--- hatari-2.3.0/tools/atari-convert-dir.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-convert-dir.1	2020-12-19 00:47:26.732519911 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-convert-dir" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-convert-dir" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-convert\-dir \- helper for creating Atari compatible disk images
+ .SH SYNOPSIS
+@@ -16,9 +16,9 @@
+ use is also recommended with \fIzip2st\fP tool content (because Mtools
+ \fImcopy\fP doesn't convert long file names correctly for Atari).
+ .SH SEE ALSO
+-.IR atari\-hd\-image (1),
+-.IR zip2st (1),
+-.IR hatari (1),
++.IR atari\-hd\-image (6),
++.IR zip2st (6),
++.IR hatari (6),
+ .IR mcopy (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/atari-hd-image.1 hatari-2.3.0.patched/tools/atari-hd-image.1
+--- hatari-2.3.0/tools/atari-hd-image.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/atari-hd-image.1	2020-12-19 00:47:08.660521554 -0500
+@@ -1,4 +1,4 @@
+-.TH "atari-hd-image" "1" "2015-04-26" "Hatari" "Hatari utilities"
++.TH "atari-hd-image" "6" "2015-04-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ atari\-hd\-image \- tool for creating a harddisk image for use with Hatari
+ .SH SYNOPSIS
+@@ -37,12 +37,12 @@
+ 8MB image with partition named 'TEST', and files from content/:
+ .B atari\-hd\-image 8 8mb-disk.img TEST content/
+ .SH SEE ALSO
+-.IR atari\-convert\-dir (1),
+-.IR hmsa (1),
+-.IR zip2st (1),
+-.IR hatari (1),
+-.IR mkdosfs (1),
+-.IR sfdisk (1),
++.IR atari\-convert\-dir (6),
++.IR hmsa (6),
++.IR zip2st (6),
++.IR hatari (6),
++.IR mkdosfs (8),
++.IR sfdisk (8),
+ .IR dd (1)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/debugger/gst2ascii.1 hatari-2.3.0.patched/tools/debugger/gst2ascii.1
+--- hatari-2.3.0/tools/debugger/gst2ascii.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/gst2ascii.1	2020-12-19 00:48:17.759515273 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "GST2ASCII" "1" "2017-11-11" "Hatari" "Hatari utilities"
++.TH "GST2ASCII" "6" "2017-11-11" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ gst2ascii \- Filter and output Atari program symbol table as ASCII
+ .SH "SYNOPSIS"
+@@ -60,8 +60,8 @@
+ .br
+ 	symbols program.sym TEXT DATA BSS
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatari_profile (1)
++.IR hatari (6),
++.IR hatari_profile (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/debugger/hatari_profile.1 hatari-2.3.0.patched/tools/debugger/hatari_profile.1
+--- hatari-2.3.0/tools/debugger/hatari_profile.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/debugger/hatari_profile.1	2020-12-19 00:55:04.273478319 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HATARI_PROFILE" "1" "2013-04-15" "Hatari" "Hatari utilities"
++.TH "HATARI_PROFILE" "6" "2013-04-15" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hatari_profile \- Post-processor for Hatari profiler data
+ .SH "SYNOPSIS"
+@@ -135,10 +135,10 @@
+ -------------------------------------------------------------
+ .fi
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR gst2ascii (1),
+-.IR hconsole (1)
+-.IR hatariui (1)
++.IR hatari (6),
++.IR gst2ascii (6),
++.IR hconsole (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hatari-prg-args.1 hatari-2.3.0.patched/tools/hatari-prg-args.1
+--- hatari-2.3.0/tools/hatari-prg-args.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hatari-prg-args.1	2020-12-19 00:49:08.415510668 -0500
+@@ -1,4 +1,4 @@
+-.TH "hatari-prg-args" "1" "2018-05-01" "Hatari" "Hatari utilities"
++.TH "hatari-prg-args" "6" "2018-05-01" "Hatari" "Hatari utilities"
+ .SH NAME
+ hatari\-prg\-args \- autorun Atari programs with arguments
+ .SH SYNOPSIS
+@@ -37,8 +37,8 @@
+ Run it from disk image instead of host directory:
+ .B hatari\-prg\-args -m -- 'A:\\\\SIDPLAY.TTP' 'SIDS\\\\TEST.SID'
+ .SH SEE ALSO
+-.IR hatari (1),
+-.IR hconsole (1)
++.IR hatari (6),
++.IR hconsole (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hconsole/hconsole.1 hatari-2.3.0.patched/tools/hconsole/hconsole.1
+--- hatari-2.3.0/tools/hconsole/hconsole.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hconsole/hconsole.1	2020-12-19 00:49:34.615508286 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HCONSOLE" "1" "2010-10-10" "Hatari" "Hatari utilities"
++.TH "HCONSOLE" "6" "2010-10-10" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hconsole \- Interactive Python console for using Hatari's remote API
+ .SH "SYNOPSIS"
+@@ -52,8 +52,8 @@
+ By default hconsole and its examples are installed under
+ the /usr/share/hatari/hconsole/ directory.
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR hatariui (1)
++.IR hatari (6),
++.IR hatariui (6)
+ .SH "AUTHOR"
+ Written by Eero Tamminen <oak at helsinkinet fi>.
+ .SH "LICENSE"
+diff -Naur hatari-2.3.0/tools/hmsa/hmsa.1 hatari-2.3.0.patched/tools/hmsa/hmsa.1
+--- hatari-2.3.0/tools/hmsa/hmsa.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/hmsa/hmsa.1	2020-12-19 00:47:44.567518290 -0500
+@@ -2,7 +2,7 @@
+ .\" First parameter, NAME, should be all caps
+ .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+ .\" other parameters are allowed: see man(7), man(1)
+-.TH "HMSA" "1" "2010-05-30" "Hatari" "Hatari utilities"
++.TH "HMSA" "6" "2010-05-30" "Hatari" "Hatari utilities"
+ .SH "NAME"
+ hmsa \- Atari MSA / ST disk image creator and converter
+ .SH "SYNOPSIS"
+@@ -48,9 +48,9 @@
+ .br
+ 	hmsa disk.msa
+ .SH "SEE ALSO"
+-.IR hatari (1),
+-.IR zip2st (1),
+-.IR atari\-hd\-image (1)
++.IR hatari (6),
++.IR zip2st (6),
++.IR atari\-hd\-image (6)
+ .SH "AUTHOR"
+ Written by Thomas Huth <huth at tuxfamily.org>. This manual page
+ added by Eero Tamminen <oak at helsinkinet fi>.
+diff -Naur hatari-2.3.0/tools/zip2st.1 hatari-2.3.0.patched/tools/zip2st.1
+--- hatari-2.3.0/tools/zip2st.1	2020-11-28 08:37:58.000000000 -0500
++++ hatari-2.3.0.patched/tools/zip2st.1	2020-12-19 00:49:25.742509093 -0500
+@@ -1,4 +1,4 @@
+-.TH "ZIP2ST" "1" "2016-02-26" "Hatari" "Hatari utilities"
++.TH "ZIP2ST" "6" "2016-02-26" "Hatari" "Hatari utilities"
+ .SH NAME
+ zip2st \- convert directory or .zip archive to .st disk image
+ .SH SYNOPSIS
+@@ -29,11 +29,11 @@
+ within a .zip archive, you need to extract them before conversion.
+ .PP
+ .SH SEE ALSO
+-.IR hmsa (1),
+-.IR atari\-convert\-dir (1),
+-.IR atari\-hd\-image (1),
+-.IR hatari (1),
+-.IR unzip (1),
++.IR hmsa (6),
++.IR atari\-convert\-dir (6),
++.IR atari\-hd\-image (6),
++.IR hatari (6),
++.IR unzip (6),
+ .IR mtools (1),
+ .IR basename (1),
+ .IR dd (1).