Author patch. Adds recursive mcopy, mdir, mattrib. Bugfixes to FAT32

handling.  Adds mshowfat cmd.

4 files changed, 28 insertions, 3 deletions

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 1c1ac7f13efe..09e9d4f04ff7 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,7 +3,7 @@
 # Date created:         5 October 1994
 # Whom:                 jmz
 #
-# $Id: Makefile,v 1.17 1997/10/08 21:12:22 jmz Exp $
+# $Id: Makefile,v 1.18 1997/12/24 01:21:25 alex Exp $
 #
 
 DISTNAME=	mtools-3.8
@@ -11,16 +11,21 @@ CATEGORIES=	emulators
 MASTER_SITES=   ftp://linux.wauug.org/pub/knaff/mtools/ \
                 ftp://sunsite.unc.edu/pub/Linux/utils/disk-management/
 
+PATCH_SITES=	${MASTER_SITES}
+PATCHFILES=	mtools-3.8-1611.diff.gz
+
 MAINTAINER=	jmz@FreeBSD.org
 
+PATCH_DIST_STRIP=	-p1
 HAS_CONFIGURE=  yes
 CONFIGURE_ARGS= --enable-xdf --prefix=${PREFIX}
 
 USE_GMAKE=	yes
 
 MAN1=		mattrib.1 mbadblocks.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 \
-		mdir.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 \
-		mrd.1 mread.1 mren.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1 mzip.1
+		mdir.1 mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 \
+		mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mwrite.1 \
+		mzip.1
 MAN5=		mtools.5
 
 post-patch:
@@ -28,6 +33,9 @@ post-patch:
 	 mv $$f $$f.orig; \
 	 sed -e s:/etc/mtools.conf:${PREFIX}/etc/mtools.conf: \
 	 < $$f.orig > $$f; done
+	@cd ${WRKSRC}/scripts; for f in ocopy xcopy; do \
+	 if [ ! -f $$f -a -f $$f.orig ]; then cp -p $$f.orig $$f ; fi \
+	 done
 
 post-install:
 	@install -c ${WRKSRC}/mtools.conf ${PREFIX}/etc
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index 14d4ca40fa94..bdcfaabefba7 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1 +1,2 @@
 MD5 (mtools-3.8.tar.gz) = 837176ae3ef9ba3ab0aff6833dfa60b6
+MD5 (mtools-3.8-1611.diff.gz) = c44f15782f3a9371774856dfbd1ee421
diff --git a/emulators/mtools/files/patch-d b/emulators/mtools/files/patch-d
new file mode 100644
index 000000000000..6649c0e28c26
--- /dev/null
+++ b/emulators/mtools/files/patch-d
@@ -0,0 +1,11 @@
+--- configure.38-1611	Wed Jan 21 00:15:20 1998
++++ configure	Wed Jan 21 00:19:56 1998
+@@ -2067,7 +2067,7 @@
+ fi
+ 
+ echo "$ac_t""$cf_cv_dcl_sys_errlist" 1>&6
+-test $cf_cv_dcl_sys_errlist = no && cat >> confdefs.h <<\EOF
++test $cf_cv_dcl_sys_errlist = no || cat >> confdefs.h <<\EOF
+ #define DECL_SYS_ERRLIST 1
+ EOF
+ 
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index e2f410f1006a..e8de120cabe1 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -46,6 +46,9 @@ bin/mkmanifest
 bin/mxtar
 bin/xcopy
 bin/mcomp
+bin/lz
+bin/mdu
+bin/mshowfat
 @unexec install-info --delete %D/info/mtools.info %D/info/dir
 info/mtools.info
 @exec [ -f %D/info/dir ] || sed -ne '1,/Menu:/p' /usr/share/info/dir > %D/info/dir
@@ -58,6 +61,7 @@ man/man1/mcopy.1.gz
 man/man1/mdel.1.gz
 man/man1/mdeltree.1.gz
 man/man1/mdir.1.gz
+man/man1/mdu.1.gz
 man/man1/mformat.1.gz
 man/man1/mkmanifest.1.gz
 man/man1/mlabel.1.gz
@@ -67,6 +71,7 @@ man/man1/mmove.1.gz
 man/man1/mrd.1.gz
 man/man1/mread.1.gz
 man/man1/mren.1.gz
+man/man1/mshowfat.1.gz
 man/man1/mtoolstest.1.gz
 man/man1/mtools.1.gz
 man/man1/mtype.1.gz