1
0
mirror of https://git.FreeBSD.org/ports.git synced 2024-10-19 19:59:43 +00:00

Update to version 3.9.6.

PR:		18222
Submitted by:	Nobuyuki Koganemaru <kogane@jp.freebsd.org>
This commit is contained in:
Steve Price 2000-04-30 19:15:37 +00:00
parent b673c88d3d
commit 9ca7a015e5
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=28159
9 changed files with 177 additions and 74 deletions

View File

@ -6,39 +6,46 @@
#
PORTNAME= mtools
PORTVERSION= 3.6
PORTVERSION= 3.9.6
CATEGORIES= japanese emulators
MASTER_SITES= ${MASTER_SITE_GNU} \
ftp://ports.jp.FreeBSD.org/pub/FreeBSD-jp/ports-jp/LOCAL_PORTS/
MASTER_SITES= ftp://ftp.tux.org/pub/knaff/mtools/ \
http://mtools.linux.lu/ \
http://people.freebsd.org/~steve/distfiles/ \
${MASTER_SITE_PORTS_JP}
DISTFILES= ${DISTNAME}${EXTRACT_SUFX} \
${DISTNAME}.PC98.patch.gz
EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
MAINTAINER= junya-w@remus.dti.ne.jp
GNU_CONFIGURE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --enable-xdf
CONFIGURE_TARGET= # empty
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
MAN1= mattrib.1 mbadblocks.1 mcat.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 mpartition.1 mrd.1 mread.1 mren.1 mshowfat.1 \
mtoolstest.1 mtools.1 mtype.1 mzip.1
MAN5= mtools.5
ALL_TARGET= all info
post-patch:
@(cd ${WRKSRC} ; \
${GZCAT} ${DISTDIR}/mtools-3.6.PC98.patch.gz | ${PATCH} -d . >/dev/null 2>&1; \
@cd ${WRKSRC}; \
${GZCAT} ${DISTDIR}/mtools-3.9.6.PC98.patch.gz | ${PATCH} -d . >/dev/null 2>&1; \
for f in config.c mtools.5 mtools.texi; do \
${MV} $$f $$f.orig; \
${SED} -e s:/etc/mtools.conf:${PREFIX}/etc/mtools.conf: \
< $$f.orig > $$f; done ;\
)
< $$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
@# 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."
@install-info ${PREFIX}/info/mtools.info ${PREFIX}/info/dir
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
MD5 (mtools-3.6.tar.gz) = 87f670df9bec4537598182429c1ffb8e
MD5 (mtools-3.6.PC98.patch.gz) = b5564458a266824d47f943f7fe3db543
MD5 (mtools-3.9.6.PC98.patch.gz) = 2bac41d46b0f693f7a573659462d0822
MD5 (mtools-3.9.6.tar.gz) = 458415bec45b404d4a7517a95253a99c

View File

@ -1,25 +1,84 @@
*** mtools.conf~ Wed Jan 31 22:02:11 1996
--- mtools.conf Mon May 27 05:03:09 1996
***************
*** 2,11 ****
drive b: file="/dev/fd1" exclusive
# First SCSI hard disk partition
! drive c: file="/dev/sda1"
# First IDE hard disk partition
! #drive c: file="/dev/hda1"
#dosemu floppy image
drive m: file="/var/lib/dosemu/diskimage"
--- 2,11 ----
drive b: file="/dev/fd1" exclusive
# First SCSI hard disk partition
! drive c: file="/dev/sd0s1"
# First IDE hard disk partition
! #drive c: file="/dev/wd0s1"
#dosemu floppy image
drive m: file="/var/lib/dosemu/diskimage"
--- 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
+
+# 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
+#
+# chmod a+rw /dev/*fd*
+#
+# or you might give SPECIFIC GROUP MEMBERS access to a PARTICULAR FLOPPY DISK
+# via the commands
+#
+# chmod g+rw /dev/rfd0 ; chgrp staff /dev/rfd0
+#
+# (and ensure selected people are in a group such as staff).
+
+
+# Floppy disks. Here, A: and B: use automatic size detection.
+#
+# Example: To prepare drive A: for use as a 1.44M floppy on FreeBSD:
+# [1] low level format with ......... fdformat /dev/rfd0.1440
+# [2] write a file system with ...... mkdosfs -f 1440 /dev/rfd0
+# [3] then use mcopy/mdir etc. in the usual way.
+#
+# The mformat command could also be used to build the DOS file system
+# in place of mkdosfs.
+
+# # FreeBSD floppy drives
+drive a: file="/dev/rfd0"
+drive b: file="/dev/rfd1"
+
+# 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.
+#
+# Example: To prepare and use a 1.72M floppy on FreeBSD:
+# [1] low level format with ......... fdformat /dev/rfd0.1720
+# [2] write a file system with ...... mformat -t 80 -h 2 -s 43 -S 1 t:
+# [3] then use mcopy/mdir etc. in the usual way.
+#
+# 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.
+#
+# Example: To prepare and use a 720K floppy on FreeBSD:
+# [1] low level format with ......... fdformat /dev/rfd0.720
+# [2] write a file system with ...... mkdosfs -f 720 /dev/fd0
+# [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"
+
+# IDE hard disks
+# first disk on the first IDE interface (wd0) slice 1 (s1)
+drive c: file="/dev/rwd0s1"
+# first disk on the first IDE interface (wd0) slice 3 (s3)
+#drive d: file="/dev/rwd0s3"
+# second disk on the first IDE interface (wd1) slice 1 (s1)
+#drive d: file="/dev/rwd1s1"
+# first disk on the second IDE interface (wd2) slice 1 (s1)
+drive d: file="/dev/rwd2s1"
+
+# PCEMU floppy boot image
+drive p: file="/usr/local/lib/pcemu/DriveA"
+
# # Linux floppy drives
# drive a: file="/dev/fd0" exclusive
@@ -61,4 +129,4 @@
# # uncomment the following line to display all file names in lower
# # case by default
-# mtools_lower_case=1
+mtools_lower_case=1

View File

@ -1,24 +1,35 @@
--- Makefile.in.orig Sat Apr 12 15:39:59 1997
+++ Makefile.in Tue May 27 22:45:57 1997
@@ -97,7 +97,7 @@
streamcache.c subdir.c toupper.c tty.o vfat.c xdf_io.c mkmanifest.c
--- Makefile.in.orig Thu Jan 28 11:08:18 1999
+++ Makefile.in Thu Jan 28 11:14:03 1999
@@ -55,7 +55,7 @@
.SUFFIXES: .o .c
.SUFFIXES: .o .c .cpp
-MAN1 = floppyd.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 \
+MAN1 = mattrib.1 mbadblocks.1 mcat.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 mpartition.1 \
mrd.1 mread.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
MAN1EXT = 1
@@ -111,7 +111,7 @@
xdf_io.c mkmanifest.c
-SCRIPTS = mcheck mxtar uz tgz xcopy mcomp
+SCRIPTS = mcheck mxtar xcopy mcomp
-SCRIPTS = mcheck mxtar uz tgz mcomp
+SCRIPTS = mcheck mxtar mcomp
LINKS=mattrib mcd mcopy mdel mdeltree mdir mformat minfo mlabel \
mmd mmount mmove mpartition mrd mread mren mtype mwrite mtoolstest \
@@ -194,11 +194,9 @@
LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdu mformat minfo mlabel \
mmd mmount mmove mpartition mrd mread mren mtype mtoolstest mshowfat \
@@ -228,11 +228,11 @@
install-scripts: $(bindir)/mtools
@$(top_srcdir)/mkinstalldirs $(bindir)
@for j in $(SCRIPTS) ; do \
- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(bindir)/$$j ; \
+ install -c -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
install-man:
@$(top_srcdir)/mkinstalldirs $(MAN1DIR)

View File

@ -1,15 +1,13 @@
*** file.c~ Fri Apr 4 22:08:01 1997
--- file.c Fri Apr 18 04:51:07 1997
***************
*** 201,208 ****
--- 201,210 ----
#ifdef HAVE_TZSET
{
#ifndef ultrix
+ #ifndef __FreeBSD__
/* Ultrix defines this to be a different type */
extern long timezone;
+ #endif
#endif
tzset();
tzone = (long) timezone;
--- file.c.orig Wed May 6 21:59:40 1998
+++ file.c Wed May 6 22:00:24 1998
@@ -295,8 +295,10 @@
#ifdef HAVE_TZSET
{
#ifndef OS_ultrix
+#ifndef __FreeBSD__
/* Ultrix defines this to be a different type */
extern long timezone;
+#endif
#endif
tzset();
tzone = (long) timezone;

View File

@ -0,0 +1,11 @@
--- mtools.5~ Mon May 17 14:42:34 1999
+++ mtools.5 Mon May 17 14:48:20 1999
@@ -18,7 +18,7 @@
.SH Name
mtools.conf - mtools configuration files
.PP
-.SS Description
+.SH Description
.PP
This manpage describes the configuration files for mtools. They
are called \fR\&\f(CW\(if/usr/local/usr/local/etc/mtools.conf\(is\fR and \fR\&\f(CW\(if~/.mtoolsrc\(is\fR. If

View File

@ -0,0 +1,11 @@
--- floppyd.c~ Thu Jul 22 00:41:08 1999
+++ floppyd.c Thu Jul 22 00:42:36 1999
@@ -675,7 +675,7 @@
/*
* Ignore dead servers so no zombies should be left hanging.
*/
- signal(SIGCLD, SIG_IGN);
+ signal(SIGCHLD, SIG_IGN);
for (;;) {
int new_sock;

View File

@ -20,7 +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 low level write (copy) a Unix file to MSDOS
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
@ -39,4 +39,3 @@ ignored during pattern matching.
This is support 1232KB Floopy reading/writing for FreeBSD(98),
SJIS Short File Name and Unicode Long File Name files.
This patch to make by kogane@kces.koganemaru.co.jp.

View File

@ -1,10 +1,13 @@
bin/mtools
@exec ln -fs %D/%F %B/mattrib
@exec ln -fs %D/%F %B/mbadblocks
@exec ln -fs %D/%F %B/mcat
@exec ln -fs %D/%F %B/mcd
@exec ln -fs %D/%F %B/mcopy
@exec ln -fs %D/%F %B/mdel
@exec ln -fs %D/%F %B/mdeltree
@exec ln -fs %D/%F %B/mdir
@exec ln -fs %D/%F %B/mdu
@exec ln -fs %D/%F %B/mformat
@exec ln -fs %D/%F %B/minfo
@exec ln -fs %D/%F %B/mlabel
@ -15,17 +18,20 @@ bin/mtools
@exec ln -fs %D/%F %B/mrd
@exec ln -fs %D/%F %B/mread
@exec ln -fs %D/%F %B/mren
@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/mtoolstest
@exec ln -fs %D/%F %B/mbadblocks
@exec ln -fs %D/%F %B/mzip
@unexec rm %B/mattrib
@unexec rm %B/mbadblocks
@unexec rm %B/mcat
@unexec rm %B/mcd
@unexec rm %B/mcopy
@unexec rm %B/mdel
@unexec rm %B/mdeltree
@unexec rm %B/mdir
@unexec rm %B/mdu
@unexec rm %B/mformat
@unexec rm %B/minfo
@unexec rm %B/mlabel
@ -36,17 +42,18 @@ bin/mtools
@unexec rm %B/mrd
@unexec rm %B/mread
@unexec rm %B/mren
@unexec rm %B/mshowfat
@unexec rm %B/mtoolstest
@unexec rm %B/mtype
@unexec rm %B/mwrite
@unexec rm %B/mtoolstest
@unexec rm %B/mbadblocks
@unexec rm %B/mzip
bin/mcheck
bin/mcomp
bin/mkmanifest
bin/mxtar
bin/xcopy
bin/mcomp
@unexec install-info --delete %D/info/mtools.info %D/info/dir
info/mtools.info
@exec install-info %D/info/mtools.info %D/info/dir
etc/mtools.conf
@exec ln -fs %D/man/man1/mcopy.1.gz %D/man/man1/mwrite.1.gz
@unexec rm %D/man/man1/mwrite.1.gz