Changes 3.9.10:

* Support for multiple drives in floppyd
* Updated .spec file
* Fixed some long name directory entry freeing bugs
* Fixed duplicate FAT writing error. Fixed segfault on short images.
* Mformat creates images of correct size.
* CYGWIN compatibility (O_BINARY flag).
* Cygwin patch for plain_io.c (no locking)
* Fix a couple of memory leaks in config file parsing. Fix llong.h
  (redefined same symbol twice)
* Fix a variable initialization problem in plain_io.c
* New mclasserase command to erase memory cards
  C99 "compatibility" (cf http://www.mtools.linux.lu/download.html)
* Fix rootskip and rate of XDF disks
* Fix inverted IS_MFORMAT_ONLY conditon in plain_io.c
* Moved putc after variable description (anybody knows about a -W
  flag so that gcc warns about these?)
* Fixed mattrib -p (missing slash)
* Added -m option to mformat to specify a non-standard mediabyte
* Added -d options to mformat to specify number of FAT copies. Can
  also be set using the MTOOLS_NFATS environmental variable.

6 files changed, 29 insertions, 27 deletions

diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 5ddf993f856..b9e857bb0f7 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.32 2004/01/24 15:06:58 grant Exp $
-#
+# $NetBSD: Makefile,v 1.33 2005/04/04 08:56:18 adam Exp $
 
-DISTNAME=	mtools-3.9.9
+DISTNAME=	mtools-3.9.10
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.tux.org/pub/knaff/mtools/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/sysutils/mtools/PLIST b/sysutils/mtools/PLIST
index 538d9436456..5ef68892774 100644
--- a/sysutils/mtools/PLIST
+++ b/sysutils/mtools/PLIST
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST,v 1.6 2004/03/10 01:27:26 seb Exp $
+@comment $NetBSD: PLIST,v 1.7 2005/04/04 08:56:18 adam Exp $
+bin/amuFormat.sh
 ${NOFLOPPYD}bin/floppyd
 ${NOFLOPPYD}bin/floppyd_installtest
 bin/lz
@@ -7,6 +8,7 @@ bin/mbadblocks
 bin/mcat
 bin/mcd
 bin/mcheck
+bin/mclasserase
 bin/mcomp
 bin/mcopy
 bin/mdel
@@ -37,6 +39,7 @@ man/man1/mattrib.1
 man/man1/mbadblocks.1
 man/man1/mcat.1
 man/man1/mcd.1
+man/man1/mclasserase.1
 man/man1/mcopy.1
 man/man1/mdel.1
 man/man1/mdeltree.1
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index 28e99cb0060..f1e170839a1 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.8 2005/02/24 13:40:55 agc Exp $
+$NetBSD: distinfo,v 1.9 2005/04/04 08:56:18 adam Exp $
 
-SHA1 (mtools-3.9.9.tar.bz2) = 91198d52fa405eff1ac9eec57cadcc86d06b6ef1
-RMD160 (mtools-3.9.9.tar.bz2) = f21a08fb3cbe9993114b76b2169cea4eac29159f
-Size (mtools-3.9.9.tar.bz2) = 262148 bytes
-SHA1 (patch-aa) = 4c04697a01eefcceef176a7816f367f95b06878c
-SHA1 (patch-ab) = 5193ddef1bce4b4116a39c3565e5729245a04557
+SHA1 (mtools-3.9.10.tar.bz2) = f916e54e1bff599946bb1e72601f99096ea79456
+RMD160 (mtools-3.9.10.tar.bz2) = 566d3f3e3c6201cfe750ba05826f8013778f90b9
+Size (mtools-3.9.10.tar.bz2) = 291876 bytes
+SHA1 (patch-aa) = 5fa8d178bf4da73813a8857412e9369762d3dce1
+SHA1 (patch-ab) = 222ec2dac5cacc8d54eb685ce73124b1c312d93e
 SHA1 (patch-ac) = 84d959c35ec65679e003f50ef6a6fb2e62ff272e
-SHA1 (patch-ad) = 891ed493888708d9fb835d9249852555938a84a0
+SHA1 (patch-ad) = d599f6b184c6da84abf4392b44d243b7b62bac3e
 SHA1 (patch-ae) = 5281829c8c79f95ff4672fabb53acd22685c17bb
 SHA1 (patch-af) = 0e2e1037be4da5f7c876cb5c9f54950e4726f6d0
diff --git a/sysutils/mtools/patches/patch-aa b/sysutils/mtools/patches/patch-aa
index 7cefe1906bf..1bde311d4ec 100644
--- a/sysutils/mtools/patches/patch-aa
+++ b/sysutils/mtools/patches/patch-aa
@@ -1,6 +1,6 @@
-$NetBSD: patch-aa,v 1.8 2003/12/11 16:05:40 adam Exp $
+$NetBSD: patch-aa,v 1.9 2005/04/04 08:56:18 adam Exp $
 
---- Makefile.in.orig	2003-02-16 21:55:16.000000000 +0000
+--- Makefile.in.orig	2004-02-28 19:06:35.000000000 +0000
 +++ Makefile.in
 @@ -11,7 +11,6 @@ USERCFLAGS = 
  USERLDFLAGS =
@@ -24,10 +24,10 @@ $NetBSD: patch-aa,v 1.8 2003/12/11 16:05:40 adam Exp $
  
 -MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
 +MAN1 = @MANFLOPPYD@ @MANFLOPPYD_INSTTEST@ mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
- mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 mkmanifest.1 \
- mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
+ mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
+ mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
  mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
-@@ -257,7 +257,7 @@ install-links: $(bindir)/mtools
+@@ -258,7 +258,7 @@ install-links: $(bindir)/mtools
  install-scripts: $(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(bindir)
  	@for j in $(SCRIPTS) ; do \
diff --git a/sysutils/mtools/patches/patch-ab b/sysutils/mtools/patches/patch-ab
index b47c0786fab..fdff93a17f7 100644
--- a/sysutils/mtools/patches/patch-ab
+++ b/sysutils/mtools/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
+$NetBSD: patch-ab,v 1.8 2005/04/04 08:56:18 adam Exp $
 
---- configure.orig	2003-02-16 11:06:45.000000000 +0000
+--- configure.orig	2005-02-28 22:10:33.000000000 +0000
 +++ configure
-@@ -5202,7 +5202,7 @@ if [ $host_os3 = hpux ] ; then
+@@ -5938,7 +5938,7 @@ if [ $host_os3 = hpux ] ; then
  fi
  
  
@@ -11,7 +11,7 @@ $NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
      LDFLAGS="$LDFLAGS -z"
  fi
  
-@@ -5471,7 +5471,7 @@ else
+@@ -6221,7 +6221,7 @@ else
  
    # It would also be nice to do this for all -L options, not just this one.
    if test -n "$x_libraries"; then
@@ -20,7 +20,7 @@ $NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
      # For Solaris; some versions of Sun CC require a space after -R and
      # others require no space.  Words are not sufficient . . . .
      case `(uname -sr) 2>/dev/null` in
-@@ -6337,7 +6337,7 @@ fi
+@@ -7281,7 +7281,7 @@ fi
  
    # Check for libraries that X11R6 Xt/Xaw programs need.
    ac_save_LDFLAGS=$LDFLAGS
@@ -29,7 +29,7 @@ $NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
    # SM needs ICE to (dynamically) link under SunOS 4.x (so we have to
    # check for ICE first), but we must link in the order -lSM -lICE or
    # we get undefined symbols.  So assume we have SM if we have ICE.
-@@ -6722,6 +6722,8 @@ if test X$use_floppyd = Xyes; then
+@@ -7738,6 +7738,8 @@ if test X$use_floppyd = Xyes; then
      fi
      FLOPPYD="floppyd floppyd_installtest"
      BINFLOPPYD="\$(bindir)/floppyd \$(bindir)/floppyd_installtest"
@@ -38,7 +38,7 @@ $NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
  
  cat >>confdefs.h <<\_ACEOF
  #define USE_FLOPPYD 1
-@@ -6730,6 +6732,8 @@ _ACEOF
+@@ -7746,6 +7748,8 @@ _ACEOF
  else
      FLOPPYD=
      BINFLOPPYD=
@@ -47,7 +47,7 @@ $NetBSD: patch-ab,v 1.7 2004/08/27 06:29:10 jlam Exp $
  fi
  
  
-@@ -7327,6 +7331,8 @@ s,@X_LIBS@,$X_LIBS,;t t
+@@ -8401,6 +8405,8 @@ s,@X_LIBS@,$X_LIBS,;t t
  s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
  s,@FLOPPYD@,$FLOPPYD,;t t
  s,@BINFLOPPYD@,$BINFLOPPYD,;t t
diff --git a/sysutils/mtools/patches/patch-ad b/sysutils/mtools/patches/patch-ad
index 883c9c2566a..498f5974a89 100644
--- a/sysutils/mtools/patches/patch-ad
+++ b/sysutils/mtools/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.4 2003/12/11 16:05:40 adam Exp $
+$NetBSD: patch-ad,v 1.5 2005/04/04 08:56:18 adam Exp $
 
---- devices.c.orig	2002-05-01 10:17:50.000000000 +0000
+--- devices.c.orig	2003-05-24 20:54:27.000000000 +0000
 +++ devices.c
-@@ -799,7 +799,7 @@ struct device devices[] = {
+@@ -807,7 +807,7 @@ struct device devices[] = {
  #endif /* __FreeBSD__ */
   
  /*** /jes -- for ALR 486 DX4/100 ***/