[pkgsrc/trunk]: pkgsrc/sysutils/mtools Update mtools to 4.0.25

[is <is%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/c3836ba56acd
branches:  trunk
changeset: 442649:c3836ba56acd
user:      is <is%pkgsrc.org@localhost>
date:      Fri Nov 27 17:55:28 2020 +0000

description:
Update mtools to 4.0.25

diffstat:

 sysutils/mtools/Makefile                 |  12 ++++++++++--
 sysutils/mtools/distinfo                 |  12 +++++-------
 sysutils/mtools/options.mk               |   4 ++--
 sysutils/mtools/patches/patch-af         |  13 -------------
 sysutils/mtools/patches/patch-mainloop.c |  24 ------------------------
 5 files changed, 17 insertions(+), 48 deletions(-)

diffs (105 lines):

diff -r 5ee157b3378c -r c3836ba56acd sysutils/mtools/Makefile
--- a/sysutils/mtools/Makefile  Fri Nov 27 16:18:35 2020 +0000
+++ b/sysutils/mtools/Makefile  Fri Nov 27 17:55:28 2020 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.58 2020/01/18 23:35:19 rillig Exp $
+# $NetBSD: Makefile,v 1.59 2020/11/27 17:55:28 is Exp $
 
-DISTNAME=      mtools-4.0.18
+DISTNAME=      mtools-4.0.25
 CATEGORIES=    sysutils
 MASTER_SITES=  ${MASTER_SITE_GNU:=mtools/}
 EXTRACT_SUFX=  .tar.bz2
@@ -10,6 +10,14 @@
 COMMENT=       FAT (MS-DOS, Atari) disk access tools
 LICENSE=       gnu-gpl-v3 # or later
 
+SUBST_CLASSES+=                strtoi
+SUBST_STAGE.strtoi=    pre-build
+SUBST_MESSAGE.strtoi=  renaming strtoi.
+SUBST_FILES.strtoi=    config.c floppyd_io.c mformat.c mpartition.c \
+                       mtools.h strtonum.c # *.[hc]
+SUBST_SED.strtoi=      -e s/strtoi/mtools_strtoi/
+
+
 GNU_CONFIGURE=         yes
 USE_TOOLS+=            gmake makeinfo
 INFO_FILES=            yes
diff -r 5ee157b3378c -r c3836ba56acd sysutils/mtools/distinfo
--- a/sysutils/mtools/distinfo  Fri Nov 27 16:18:35 2020 +0000
+++ b/sysutils/mtools/distinfo  Fri Nov 27 17:55:28 2020 +0000
@@ -1,10 +1,8 @@
-$NetBSD: distinfo,v 1.22 2015/11/04 01:32:22 agc Exp $
+$NetBSD: distinfo,v 1.23 2020/11/27 17:55:28 is Exp $
 
-SHA1 (mtools-4.0.18.tar.bz2) = cd45031441ac944eacebdc8d4b82b20cd9cc8461
-RMD160 (mtools-4.0.18.tar.bz2) = 31bd7af355f609e072daa173d44771eac85e9473
-SHA512 (mtools-4.0.18.tar.bz2) = 3981a4727aa4e2ec5c931201b236f52fcd1c9d55f888cb2fbdc5c4172402e2b229ede9a5005b972ffdad59bcb861e2fcc01404845e521116419079ae78239090
-Size (mtools-4.0.18.tar.bz2) = 420190 bytes
+SHA1 (mtools-4.0.25.tar.bz2) = acf941398cd8f507e8fee975b2aa9abd49c3b82e
+RMD160 (mtools-4.0.25.tar.bz2) = 9cc6d2794ff6b738e7efe8cd8848a040b3ee5a1c
+SHA512 (mtools-4.0.25.tar.bz2) = 91b879de6b41bf9fd6d9282d846e21fe58dbcd3461d97d2d6cae752a309a5129091a0e6ffda5b28ef062c33970a1c0a43ff1cf19106232866bdbdb762c64a143
+Size (mtools-4.0.25.tar.bz2) = 421807 bytes
 SHA1 (patch-aa) = 493b06455ee3169e6db916a9d535dad5a124edbc
 SHA1 (patch-ae) = 0142fa2fccfc81da0daab2a3caee2dbcb107f895
-SHA1 (patch-af) = fcf66c887f9513d812c01ff314669959f94ed7b3
-SHA1 (patch-mainloop.c) = 3754c5be44f2fb9671bc14dc3cad59b520c04976
diff -r 5ee157b3378c -r c3836ba56acd sysutils/mtools/options.mk
--- a/sysutils/mtools/options.mk        Fri Nov 27 16:18:35 2020 +0000
+++ b/sysutils/mtools/options.mk        Fri Nov 27 17:55:28 2020 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.2 2012/03/18 12:41:53 shattered Exp $
+# $NetBSD: options.mk,v 1.3 2020/11/27 17:55:28 is Exp $
 
 PKG_OPTIONS_VAR=               PKG_OPTIONS.mtools
 PKG_SUPPORTED_OPTIONS=         floppyd
-PKG_OPTIONS_LEGACY_VARS+=      MTOOLS_ENABLE_FLOPPYD:floppyd
+PKG_DEFAULT_OPTIONS+=          -floppyd 
 
 .include "../../mk/bsd.options.mk"
 
diff -r 5ee157b3378c -r c3836ba56acd sysutils/mtools/patches/patch-af
--- a/sysutils/mtools/patches/patch-af  Fri Nov 27 16:18:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-af,v 1.4 2010/05/03 10:17:05 is Exp $
-
---- charsetConv.c.orig 2008-11-18 21:33:11.000000000 +0000
-+++ charsetConv.c
-@@ -265,7 +265,7 @@ static void initialize_to_native(void)
-  */
- int wchar_to_native(const wchar_t *wchar, char *native, size_t len)
- {
--#ifdef HAVE_ICONV_H
-+#if defined(HAVE_ICONV_H) && defined(__linux__)
-       int mangled;
-       int r;
-       initialize_to_native();
diff -r 5ee157b3378c -r c3836ba56acd sysutils/mtools/patches/patch-mainloop.c
--- a/sysutils/mtools/patches/patch-mainloop.c  Fri Nov 27 16:18:35 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-$NetBSD: patch-mainloop.c,v 1.2 2013/01/18 00:34:30 mef Exp $
-
-Fix unused attribute usage.
-
---- mainloop.c.orig    2013-01-15 16:21:14.000000000 +0000
-+++ mainloop.c
-@@ -86,7 +86,7 @@ static const char *fix_mcwd(char *ans)
- }
- 
- int unix_dir_loop(Stream_t *Stream, MainParam_t *mp); 
--int unix_loop(UNUSED(Stream_t *Stream), MainParam_t *mp, char *arg,
-+int unix_loop(Stream_t *Stream UNUSEDP, MainParam_t *mp, char *arg,
-             int follow_dir_link);
- 
- static int _unix_loop(Stream_t *Dir, MainParam_t *mp,
-@@ -95,7 +95,7 @@ static int _unix_loop(Stream_t *Dir, Mai
-       return unix_dir_loop(Dir, mp);
- }
- 
--int unix_loop(UNUSED(Stream_t *Stream), MainParam_t *mp,
-+int unix_loop(Stream_t *Stream, MainParam_t *mp,
-             char *arg, int follow_dir_link)
- {
-       int ret;