From e4cc45111fe6b797b081437fb8762a3f067793c3 Mon Sep 17 00:00:00 2001
From: fgsch <fgsch@openbsd.org>
Date: Thu, 18 Nov 2004 23:36:12 +0000
Subject: [PATCH] update to dist. patch 20040505.

---
 sysutils/mtools/Makefile               |  4 ++--
 sysutils/mtools/distinfo               |  6 +++---
 sysutils/mtools/patches/patch-llong_h  | 12 ------------
 sysutils/mtools/patches/patch-precmd_c | 12 ------------
 sysutils/mtools/pkg/PLIST              |  5 ++++-
 5 files changed, 9 insertions(+), 30 deletions(-)
 delete mode 100644 sysutils/mtools/patches/patch-llong_h
 delete mode 100644 sysutils/mtools/patches/patch-precmd_c

diff --git a/sysutils/mtools/Makefile b/sysutils/mtools/Makefile
index 554be46695d..ccc20eaa144 100644
--- a/sysutils/mtools/Makefile
+++ b/sysutils/mtools/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.44 2003/07/21 17:33:07 fgsch Exp $
+# $OpenBSD: Makefile,v 1.45 2004/11/18 23:36:12 fgsch Exp $
 
 COMMENT=	"read/write/list/format DOS disks under Unix"
 
-DATE=		20030718
+DATE=		20040505
 DISTNAME=	mtools-3.9.9
 PKGNAME=	${DISTNAME}.${DATE}
 CATEGORIES=	sysutils
diff --git a/sysutils/mtools/distinfo b/sysutils/mtools/distinfo
index 3501c2e7b44..041ad95b82a 100644
--- a/sysutils/mtools/distinfo
+++ b/sysutils/mtools/distinfo
@@ -1,6 +1,6 @@
-MD5 (mtools-3.9.9-20030718.diff.gz) = c07d7352e63ebc9774362b77b89df7e6
+MD5 (mtools-3.9.9-20040505.diff.gz) = 7dfaef9449c6654d4dec042475f134e2
 MD5 (mtools-3.9.9.tar.gz) = 3e68b857b4e1f3a6521d1dfefbd30a36
-RMD160 (mtools-3.9.9-20030718.diff.gz) = 8d3422710d95f55e968d82c2199d0a0077634181
+RMD160 (mtools-3.9.9-20040505.diff.gz) = 2db68962d4bf5b581c78d8214b5500799e980711
 RMD160 (mtools-3.9.9.tar.gz) = df85452f062366b6581211a7669bc6a236545d83
-SHA1 (mtools-3.9.9-20030718.diff.gz) = bf0561640b2084e2948ef15192116b80886eadb6
+SHA1 (mtools-3.9.9-20040505.diff.gz) = 8e19b7d09bf09d82993626ff37d542e98ab3c663
 SHA1 (mtools-3.9.9.tar.gz) = 47551ee9331527fadaf174cf55952d5113443564
diff --git a/sysutils/mtools/patches/patch-llong_h b/sysutils/mtools/patches/patch-llong_h
deleted file mode 100644
index 349237a8c85..00000000000
--- a/sysutils/mtools/patches/patch-llong_h
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-llong_h,v 1.1 2003/05/26 02:02:08 fgsch Exp $
---- llong.h.orig	Sun May 25 22:28:33 2003
-+++ llong.h	Sun May 25 22:28:42 2003
-@@ -8,7 +8,7 @@
- /* if off_t is already 64 bits, be happy, and don't worry about the
-  * loff_t and llseek stuff */
- #define MT_OFF_T off_t
--#define MT_OFF_T size_t
-+#define MT_SIZE_T size_t
- #endif
- 
- #ifndef MT_OFF_T
diff --git a/sysutils/mtools/patches/patch-precmd_c b/sysutils/mtools/patches/patch-precmd_c
deleted file mode 100644
index 9a1fe0b0fc4..00000000000
--- a/sysutils/mtools/patches/patch-precmd_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-precmd_c,v 1.1 2002/10/05 19:09:26 fgsch Exp $
---- precmd.c.orig	Sun May 20 15:18:13 2001
-+++ precmd.c	Sat Oct  5 15:55:51 2002
-@@ -21,7 +21,7 @@ void precmd(struct device *dev)
- 			exit(1);
- 			break;
- 		case 0: /* the son */
--			execl("/bin/sh", "sh", "-c", dev->precmd, 0);
-+			execl("/bin/sh", "sh", "-c", dev->precmd, (char *)NULL);
- 			break;
- 		default:
- 			wait(&status);
diff --git a/sysutils/mtools/pkg/PLIST b/sysutils/mtools/pkg/PLIST
index b093c9c5d5a..5acb64c04ca 100644
--- a/sysutils/mtools/pkg/PLIST
+++ b/sysutils/mtools/pkg/PLIST
@@ -1,4 +1,5 @@
-@comment $OpenBSD: PLIST,v 1.8 2004/09/15 18:39:33 espie Exp $
+@comment $OpenBSD: PLIST,v 1.9 2004/11/18 23:36:12 fgsch Exp $
+bin/amuFormat.sh
 bin/floppyd
 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
@@ -38,6 +40,7 @@ bin/uz
 @man man/man1/mbadblocks.1
 @man man/man1/mcat.1
 @man man/man1/mcd.1
+@man man/man1/mclasserase.1
 @man man/man1/mcopy.1
 @man man/man1/mdel.1
 @man man/man1/mdeltree.1