summaryrefslogtreecommitdiffstats
path: root/emulators
diff options
context:
space:
mode:
authorobrien <obrien@FreeBSD.org>1998-05-07 09:52:37 +0000
committerobrien <obrien@FreeBSD.org>1998-05-07 09:52:37 +0000
commit48f09c1df8b1a73bf05c09740a56b19d83fd622d (patch)
treea2421061a57d67c5e03eefa780070cf1cdd59f6c /emulators
parent6224d7b54224ee1d36a18a842b61aed2b0935c9c (diff)
downloadFreeBSD-ports-48f09c1df8b1a73bf05c09740a56b19d83fd622d.zip
FreeBSD-ports-48f09c1df8b1a73bf05c09740a56b19d83fd622d.tar.gz
vanilla just barely beat me on upgrading this.
Merging parts of my upgrade.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/mtools/Makefile18
-rw-r--r--emulators/mtools/distinfo1
-rw-r--r--emulators/mtools/files/patch-263
-rw-r--r--emulators/mtools/files/patch-a10
-rw-r--r--emulators/mtools/pkg-descr1
-rw-r--r--emulators/mtools/pkg-plist4
6 files changed, 38 insertions, 59 deletions
diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index 8d4dfaf..cf23f0b 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -3,24 +3,28 @@
# Date created: 5 October 1994
# Whom: jmz
#
-# $Id: Makefile,v 1.19 1998/01/21 08:57:15 obrien Exp $
+# $Id: Makefile,v 1.20 1998/05/07 01:59:22 vanilla Exp $
#
DISTNAME= mtools-3.9
CATEGORIES= emulators
MASTER_SITES= ftp://linux.wauug.org/pub/knaff/mtools/
+PATCH_SITES= ${MASTER_SITES}
+PATCHFILES= mtools-3.9-0305.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 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 \
- mzip.1 mpartition.1
+ mdir.1 mdu.1 mformat.1 mkmanifest.1 mlabel.1 mmd.1 mmount.1 \
+ mmove.1 mpartition.1 mrd.1 mread.1 mren.1 mshowfat.1 \
+ mtoolstest.1 mtools.1 mtype.1 mzip.1
MAN5= mtools.5
post-patch:
@@ -33,7 +37,11 @@ post-patch:
done
post-install:
- @install -c ${WRKSRC}/mtools.conf ${PREFIX}/etc
+ @# mwrite has been removed by author, but we'll keep it just a bit longer
+ @ln -sf ${PREFIX}/bin/mtools ${PREFIX}/bin/mwrite
+ @ln -sf ${PREFIX}/man/man1/mcopy.1.gz ${PREFIX}/man/man1/mwrite.1.gz
+ @${INSTALL_DATA} ${WRKSRC}/mtools.conf ${PREFIX}/etc
+ @${ECHO} "Please verify ${PREFIX}/etc/mtools.conf for your machine."
@if [ ! -f ${PREFIX}/info/dir ]; then \
${SED} -ne '1,/Menu:/p' /usr/share/info/dir > ${PREFIX}/info/dir; \
fi
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index 717c0c2..f66fd72 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1 +1,2 @@
MD5 (mtools-3.9.tar.gz) = db6ff3db9751a1285f3ce75c9b81f0b8
+MD5 (mtools-3.9-0305.diff.gz) = 5bdc0749c5a8bf0c5d17b41f2d8975b4
diff --git a/emulators/mtools/files/patch-2 b/emulators/mtools/files/patch-2
index 5b9c864..9ba7fe3 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 d34f880..a6ee929 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)
diff --git a/emulators/mtools/pkg-descr b/emulators/mtools/pkg-descr
index f5a5c37..09e854a 100644
--- a/emulators/mtools/pkg-descr
+++ b/emulators/mtools/pkg-descr
@@ -20,6 +20,7 @@ mrd RD/RMDIR remove an MSDOS subdirectory
mread COPY low level read (copy) an MSDOS file to Unix
mren REN/RENAME rename an existing MSDOS file
mtype TYPE display contents of an MSDOS file
+mwrite COPY alias for mcopy, will be removed soon
You should be able to just close your eyes and pretend you're on an MSDOS
system. Everything should work the same... except for the added 'm' at
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index 0c6bc18..f562c69 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -20,6 +20,7 @@ bin/mtools
@exec ln -fs %D/%F %B/mshowfat
@exec ln -fs %D/%F %B/mtoolstest
@exec ln -fs %D/%F %B/mtype
+@exec ln -fs %D/%F %B/mwrite
@exec ln -fs %D/%F %B/mzip
@unexec rm %B/mattrib
@unexec rm %B/mbadblocks
@@ -42,6 +43,7 @@ bin/mtools
@unexec rm %B/mshowfat
@unexec rm %B/mtoolstest
@unexec rm %B/mtype
+@unexec rm %B/mwrite
@unexec rm %B/mzip
bin/mcheck
bin/mcomp
@@ -56,6 +58,8 @@ man/man1/mattrib.1.gz
man/man1/mbadblocks.1.gz
man/man1/mcd.1.gz
man/man1/mcopy.1.gz
+@exec ln -fs %D/%F %B/mwrite.1.gz
+@unexec rm %B/mwrite.1.gz
man/man1/mdel.1.gz
man/man1/mdeltree.1.gz
man/man1/mdir.1.gz
OpenPOWER on IntegriCloud