trader: update to 7.18.

Version 7.18 (3rd August, 2022)
-------------------------------

Minor bug fix: remove the ``<icon>`` line from `trader.appdata.xml.in` so
that the icon is taken from the `trader.desktop` file instead, otherwise
Fedora builds fail with a message from ``appstream-util validate-relax``
that "tag-invalid: stock icon is not valid [trader.svg]".


Version 7.17 (3rd August, 2022)
-------------------------------

Fixed two TOCTOU (time-of-check / time-of-use) bugs that arose between
checking for the traditional data directory and creating a data directory
later.  Also fixed a bug when the ``HOME`` environment variable is empty:
use the current directory instead.

Updated the Brazilian Portuguese, Norwegian Bokmal, Swedish, French,
Esperanto, Serbian, German and English translations (in that order), with
thanks to Rafael Fontenelle, Johnny A. Solbu, Anders Jonsson, Frederic
Marchal, Felipe Castro, Miroslav Nikolih and Roland Illig respectively.

Updated the minimum version of GNU Autoconf required, giving the option
of compiling with C17 or C11 instead of C99.  Updated to the latest
snapshot of the Gnulib GNU Portability Library.

3 files changed, 11 insertions, 11 deletions

diff --git a/games/trader/Makefile b/games/trader/Makefile
index 546a0d5e985..20637252360 100644
--- a/games/trader/Makefile
+++ b/games/trader/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2022/06/27 15:29:15 fcambus Exp $
+# $NetBSD: Makefile,v 1.3 2022/09/27 20:32:56 fcambus Exp $
 
-DISTNAME=	trader-7.16
+DISTNAME=	trader-7.18
 CATEGORIES=	games
 MASTER_SITES=	https://ftp.zap.org.au/pub/trader/unix/
 
diff --git a/games/trader/distinfo b/games/trader/distinfo
index aebe2941d7e..4a7571bffda 100644
--- a/games/trader/distinfo
+++ b/games/trader/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 10:44:28 nia Exp $
+$NetBSD: distinfo,v 1.4 2022/09/27 20:32:56 fcambus Exp $
 
-BLAKE2s (trader-7.16.tar.gz) = 63acfd2feccf7fbfd5e5ccdcca0795c60241ebe0ac4058ae42cb1551359a28b6
-SHA512 (trader-7.16.tar.gz) = a5565f26844c8aa98e18c0e90c75f2e0c4cafb43123b7d6be6228d278912ca76048d41d4d6711a31c9f6e22d5f62b9ba18105366fc4a1ea1cedeac1ba3fec794
-Size (trader-7.16.tar.gz) = 1259294 bytes
-SHA1 (patch-src_utils.c) = 80d5e22f7c01359ba8d881c9c2b1b27fc0882599
+BLAKE2s (trader-7.18.tar.gz) = 8100d92b39c9f16daccc9ae3ec9bf3d6ba155861bf5f1ee41245d567a1854ff5
+SHA512 (trader-7.18.tar.gz) = f70a23b3d45bb2c275266d85db4217ab6729fd1f6576aeaa7dfd3ef2f307ce164f1cd34924ae7c029123bf26c49e208c763a096fcdf2a5d41eba6afaa9687509
+Size (trader-7.18.tar.gz) = 1286469 bytes
+SHA1 (patch-src_utils.c) = 6571d3b83c025253bcb1b6f420fdae3d72f02407
diff --git a/games/trader/patches/patch-src_utils.c b/games/trader/patches/patch-src_utils.c
index 0079a5a4b8b..bd1e758d664 100644
--- a/games/trader/patches/patch-src_utils.c
+++ b/games/trader/patches/patch-src_utils.c
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_utils.c,v 1.1 2021/05/04 08:19:42 fcambus Exp $
+$NetBSD: patch-src_utils.c,v 1.2 2022/09/27 20:32:56 fcambus Exp $
 
 - Do not use err_exit() to generate error messages when locale initialization
   fails as in this case curs_set() is called before initscr(), which causes
@@ -7,9 +7,9 @@ $NetBSD: patch-src_utils.c,v 1.1 2021/05/04 08:19:42 fcambus Exp $
 - Avoid using strfmon(3) on NetBSD, there are formatting issues when LANG is
   set to anything else than C.
 
---- src/utils.c.orig	2021-01-19 05:42:38.000000000 +0000
+--- src/utils.c.orig	2022-08-03 10:12:04.000000000 +0000
 +++ src/utils.c
-@@ -591,8 +591,9 @@ extern void init_locale (void)
+@@ -698,8 +698,9 @@ extern void init_locale (void)
  
      // Initialise the current locale
      if (setlocale(LC_ALL, "") == NULL) {
@@ -21,7 +21,7 @@ $NetBSD: patch-src_utils.c,v 1.1 2021/05/04 08:19:42 fcambus Exp $
      }
  
      // Use correct message catalogs for the locale
-@@ -682,7 +683,11 @@ ssize_t xwcsfmon (wchar_t *restrict buf,
+@@ -789,7 +790,11 @@ ssize_t xwcsfmon (wchar_t *restrict buf,
         produce "12345" instead of something like "-$123.45"!  The
         following code overcomes these limitations by using snprintf(). */