vanilla just barely beat me on upgrading this.

Merging parts of my upgrade.

2 files changed, 19 insertions, 54 deletions

diff --git a/emulators/mtools/files/patch-2 b/emulators/mtools/files/patch-2
index 5b9c864466a8..9ba7fe33cf72 100644
--- a/emulators/mtools/files/patch-2
+++ b/emulators/mtools/files/patch-2
@@ -1,14 +1,10 @@
---- mtools.conf.orig	Sun Jan  4 17:29:32 1998
-+++ mtools.conf	Wed May  6 21:56:43 1998
-@@ -1,22 +1,74 @@
+--- mtools.conf.orig	Sun Jan  4 01:29:32 1998
++++ mtools.conf	Thu May  7 01:35:37 1998
+@@ -1,6 +1,74 @@
  # Example mtools.conf files.  Uncomment the lines which correspond to
  # your architecture and comment out the "SAMPLE FILE" line below
 -SAMPLE FILE
-+#SAMPLE FILE
- 
--# # Linux floppy drives
--# drive a: file="/dev/fd0" exclusive
--# drive b: file="/dev/fd1" exclusive
++
 +# A note on permissions:  a user must have read and write permissions for the
 +# devices named here in order to access the DOS file systems.  You might give
 +# ALL USERS access to ALL FLOPPY DISKS via the command
@@ -32,17 +28,11 @@
 +#
 +# The mformat command could also be used to build the DOS file system
 +# in place of mkdosfs.
- 
--# # First SCSI hard disk partition
--# drive c: file="/dev/sda1"
++
++# # FreeBSD floppy drives
 +drive a: file="/dev/rfd0"
 +drive b: file="/dev/rfd1"
- 
--# # First IDE hard disk partition
--# drive c: file="/dev/hda1"
- 
--# # dosemu floppy image
--# drive m: file="/var/lib/dosemu/diskimage"
++
 +# Drive T: is a 1.72M floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
@@ -54,7 +44,7 @@
 +#
 +# The above note on access permissions applies to /dev/rfd0.1720 as well.
 +drive t: file="/dev/rfd0.1720"
-+ 
++
 +# Drive S: is a 720K floppy format with 80 cylinders, double sided (2 heads),
 +#          and 43 sectors of size 256 bytes per track.  It uses the same
 +#          floppy disk drive (fd0) as drive A: above.
@@ -65,7 +55,7 @@
 +#   [3] then use mcopy/mdir etc. in the usual way.
 +#
 +drive s: file="/dev/rfd0.720"
-+ 
++
 +# SCSI hard disks
 +#  first disk (sd0) slice 1 (s1)
 +#drive c: file="/dev/rsd0s1"
@@ -79,40 +69,15 @@
 +#drive d: file="/dev/rwd1s1"
 +#  first disk on the second IDE interface (wd2) slice 1 (s1)
 +drive d: file="/dev/rwd2s1"
- 
--# # dosemu hdimage
--# drive n: file="/var/lib/dosemu/diskimage" offset=3840
++
 +# PCEMU floppy boot image
 +drive p: file="/usr/local/lib/pcemu/DriveA"
++
  
- # # Atari ramdisk image
- # drive o: file="/tmp/atari_rd" offset=136
-@@ -37,28 +89,11 @@
- #          A/UX target 5 on 1st scsi bus   jaz or zip
- # drive X: file="/dev/rdsk/c105d0s31"      partition=4
+ # # Linux floppy drives
+ # drive a: file="/dev/fd0" exclusive
+@@ -61,4 +129,4 @@
  
--
- # Some examples for BeOS.
- # floppy drive. hardcoded in devices.c, so no real need to define it here
- #drive a: file="/dev/floppy_disk" exclusive
- # ZIP drive on SCSI ID 6
- #drive z: file="/dev/scsi_disk_060" offset=16384 fat_bits=16                        
--
--# SCO Unix 3.2v4
--# # Floppy disk drives
--#
--# drive a: file="/dev/install" exclusive
--# drive b: file="/dev/install1" exclusive
--#  
--# # SCSI hard disk partitions
--#  
--# drive c: file="/dev/dsk/0sC"
--# drive d: file="/dev/dsk/0sD"
--# drive e: file="/dev/dsk/0sE"
--# drive f: file="/dev/dsk/0sF"
--# drive g: file="/dev/dsk/0sG"
--# drive h: file="/dev/dsk/0sH"
--
  # # uncomment the following line to display all file names in lower
  # # case by default
 -# mtools_lower_case=1
diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-a
index d34f8800fff5..a6ee9294aa94 100644
--- a/emulators/mtools/files/patch-a
+++ b/emulators/mtools/files/patch-a
@@ -1,5 +1,5 @@
---- Makefile.in.orig	Wed May  6 21:57:14 1998
-+++ Makefile.in	Wed May  6 21:59:13 1998
+--- Makefile.in.orig	Thu May  7 02:49:14 1998
++++ Makefile.in	Thu May  7 02:49:48 1998
 @@ -102,7 +102,7 @@
  xdf_io.c mkmanifest.c
  
@@ -14,13 +14,13 @@
  	@$(top_srcdir)/mkinstalldirs $(bindir)
  	@for j in $(SCRIPTS) ; do \
 -		$(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
-+		install -o bin -g bin -m 755 $(srcdir)/scripts/$$j $(bindir)/$$j ; \
++ 		$(BSD_INSTALL_SCRIPT) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
  		echo $(bindir)/$$j ; \
  	done
 -	rm -f $(bindir)/lz
 -	$(LN_S) uz $(bindir)/lz
-+#	rm -f $(bindir)/lz
-+#	$(LN_S) uz $(bindir)/lz
++	#rm -f $(bindir)/lz
++	#$(LN_S) uz $(bindir)/lz
  
  install-man:
  	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)