CVS commit: pkgsrc/sysutils/mtools

["Ignatios Souvatzis" <is%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   is
Date:           Fri Nov 27 17:55:28 UTC 2020

Modified Files:
        pkgsrc/sysutils/mtools: Makefile distinfo options.mk
Removed Files:
        pkgsrc/sysutils/mtools/patches: patch-af patch-mainloop.c

Log Message:
Update mtools to 4.0.25


To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 pkgsrc/sysutils/mtools/Makefile
cvs rdiff -u -r1.22 -r1.23 pkgsrc/sysutils/mtools/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/sysutils/mtools/options.mk
cvs rdiff -u -r1.4 -r0 pkgsrc/sysutils/mtools/patches/patch-af
cvs rdiff -u -r1.2 -r0 pkgsrc/sysutils/mtools/patches/patch-mainloop.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/sysutils/mtools/Makefile
diff -u pkgsrc/sysutils/mtools/Makefile:1.58 pkgsrc/sysutils/mtools/Makefile:1.59
--- pkgsrc/sysutils/mtools/Makefile:1.58        Sat Jan 18 23:35:19 2020
+++ pkgsrc/sysutils/mtools/Makefile     Fri Nov 27 17:55:28 2020
@@ -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 @@ HOMEPAGE=    https://www.gnu.org/software/m
 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

Index: pkgsrc/sysutils/mtools/distinfo
diff -u pkgsrc/sysutils/mtools/distinfo:1.22 pkgsrc/sysutils/mtools/distinfo:1.23
--- pkgsrc/sysutils/mtools/distinfo:1.22        Wed Nov  4 01:32:22 2015
+++ pkgsrc/sysutils/mtools/distinfo     Fri Nov 27 17:55:28 2020
@@ -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

Index: pkgsrc/sysutils/mtools/options.mk
diff -u pkgsrc/sysutils/mtools/options.mk:1.2 pkgsrc/sysutils/mtools/options.mk:1.3
--- pkgsrc/sysutils/mtools/options.mk:1.2       Sun Mar 18 12:41:53 2012
+++ pkgsrc/sysutils/mtools/options.mk   Fri Nov 27 17:55:28 2020
@@ -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"