Update to 4.0.26

PR:		252531
Submitted by:	Mara Sophie Grosch <littlefox@lf-net.org>

8 files changed, 29 insertions, 128 deletions

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index cd3a30cf668b..9cec730b4ac8 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	mtools
-PORTVERSION=	4.0.10
-PORTREVISION=	6
+PORTVERSION=	4.0.26
 CATEGORIES=	emulators
 MASTER_SITES=	GNU
 
diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo
index 446286d9c92e..60eb44a53314 100644
--- a/emulators/mtools/distinfo
+++ b/emulators/mtools/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mtools-4.0.10.tar.bz2) = 860fee13acb39365bd28763070e24011ea55f381f96714d2841937525aa02ded
-SIZE (mtools-4.0.10.tar.bz2) = 381481
+TIMESTAMP = 1610672966
+SHA256 (mtools-4.0.26.tar.bz2) = 539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a
+SIZE (mtools-4.0.26.tar.bz2) = 420648
diff --git a/emulators/mtools/files/patch-2 b/emulators/mtools/files/patch-2
deleted file mode 100644
index 215f92ef082e..000000000000
--- a/emulators/mtools/files/patch-2
+++ /dev/null
@@ -1,94 +0,0 @@
---- mtools.conf.orig	Sun May 20 20:18:12 2001
-+++ mtools.conf	Thu Oct  7 22:14:36 2004
-@@ -1,6 +1,67 @@
- # 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[0-9]*
-+#
-+# or you might give SPECIFIC GROUP MEMBERS access to a PARTICULAR FLOPPY DISK
-+# via the commands
-+#
-+#     chmod g+rw /dev/fd0 ; chgrp staff /dev/fd0
-+#
-+# (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 -f 1440 /dev/fd0
-+#   [2] write a file system with ...... newfs_msdos -f 1440 /dev/fd0
-+#   [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 newfs_msdos.
-+
-+# # FreeBSD floppy drives
-+drive a: file="/dev/fd0"
-+drive b: file="/dev/fd1"
-+
-+# FreeBSD automatically detects a number of common floppy densities, like
-+# 720 KB and 1440 KB MS-DOS formatted media.
-+#
-+# To change the density of FreeBSD floppy devices to something unusual,
-+# use fdcontrol(8).
-+
-+# LS120 (ATAPI) floppy disk               (extra parameters allow easy mformat)
-+#
-+# -- Drive L: is an LS120 in 100MB mode   (mdir shows 125967576 bytes capacity)
-+#
-+drive l: file="/dev/afd0" exclusive mformat_only cylinders=963 heads=8 sectors=32
-+#
-+# -- Drive M: is an LS120 in 1.4MB mode
-+#
-+drive m: file="/dev/afd0" exclusive mformat_only cylinders=80 heads=2 sectors=18
-+
-+# SCSI hard disks
-+#  first disk (da0) slice 1 (s1)
-+#drive c: file="/dev/da0s1"
-+
-+# IDE hard disks
-+#   first disk on the first IDE interface (wd0) slice 1 (s1)
-+drive c: file="/dev/ad0s1"
-+#   first disk on the first IDE interface (wd0) slice 3 (s3)
-+#drive d: file="/dev/ad0s3"
-+#  second disk on the first IDE interface (wd1) slice 1 (s1)
-+#drive d: file="/dev/ad1s1"
-+#  first disk on the second IDE interface (wd2) slice 1 (s1)
-+drive d: file="/dev/ad2s1"
-+
-+# PCEMU floppy boot image
-+drive p: file="/usr/local/lib/pcemu/DriveA"
-+
- 
- # # Linux floppy drives
- # drive a: file="/dev/fd0" exclusive
-@@ -61,4 +122,4 @@
- 
- # # uncomment the following line to display all file names in lower
- # # case by default
--# mtools_lower_case=1
-+mtools_lower_case=1
---- devices.c.orig	Thu Oct  7 22:12:00 2004
-+++ devices.c	Thu Oct  7 22:16:46 2004
-@@ -790,10 +790,10 @@
- #ifdef OS_freebsd
- #define predefined_devices
- struct device devices[] = {
--	{"/dev/fd0.1440", 'A', FHD312},
--	{"/dev/fd0.720",  'A', FDD312},
--	{"/dev/fd1.1200", 'B', MHD514},
--	{"/dev/sd0s1",     'C', GENHD},
-+	{"/dev/fd0",   'A', FHD312},
-+	{"/dev/fd0",   'A', FDD312},
-+	{"/dev/fd1",   'B', MHD514},
-+	{"/dev/da0s1", 'C', GENHD},
- 	REMOTE
- };
- #endif /* __FreeBSD__ */
diff --git a/emulators/mtools/files/patch-a b/emulators/mtools/files/patch-Makefile.in
index 98525d1e0374..10f1b3544da0 100644
--- a/emulators/mtools/files/patch-a
+++ b/emulators/mtools/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in.orig
+--- Makefile.in.orig	2018-12-09 19:54:34 UTC
 +++ Makefile.in
-@@ -72,10 +72,13 @@
+@@ -72,10 +72,13 @@ INSTALL_INFO	= @INSTALL_INFO@
  .SUFFIXES: .o .c
  .SUFFIXES: .o .c
  
@@ -8,14 +8,14 @@
 +MAN1 = mattrib.1 mbadblocks.1 mcat.1 mcd.1 \
  mclasserase.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1  minfo.1 \
  mkmanifest.1 mlabel.1 mmd.1 mmount.1 mmove.1 mpartition.1 \
- mrd.1 mren.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
+ mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1
 +ifndef WITHOUT_X11
 +MAN1 +=	floppyd.1 floppyd_installtest.1
 +endif
  MAN1EXT	= 1
  MAN1DIR	= $(DESTDIR)$(mandir)/man${MAN1EXT}
  MAN5	= mtools.5
-@@ -132,7 +135,7 @@
+@@ -133,7 +136,7 @@ scsi.c signal.c stream.c streamcache.c subdir.c unixdi
  xdf_io.c mkmanifest.c
  
  
@@ -23,8 +23,8 @@
 +SCRIPTS = mcheck mxtar mcomp amuFormat.sh
  
  LINKS=mattrib mcat mcd mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \
- mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshowfat \
-@@ -269,11 +272,11 @@
+ mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshortname \
+@@ -278,11 +281,11 @@ install-links: $(DESTDIR)$(bindir)/mtools
  install-scripts: $(DESTDIR)$(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	@for j in $(SCRIPTS) ; do \
@@ -33,9 +33,9 @@
  		echo $(DESTDIR)$(bindir)/$$j ; \
  	done
 -	rm -f $(DESTDIR)$(bindir)/lz
--	$(LN_S) uz $(DESTDIR)$(bindir)/lz
+-	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
 +	#rm -f $(DESTDIR)$(bindir)/lz
-+	#$(LN_S) uz $(DESTDIR)$(bindir)/lz
++	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
  
  install-man:
  	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
diff --git a/emulators/mtools/files/patch-g b/emulators/mtools/files/patch-configure
index 56226c691a6b..f7dc9e442ebd 100644
--- a/emulators/mtools/files/patch-g
+++ b/emulators/mtools/files/patch-configure
@@ -1,6 +1,6 @@
---- ../mtools-3.9.6/configure	Thu Jun  3 20:51:36 1999
-+++ configure	Sun Oct 15 15:32:07 2000
-@@ -2461,10 +2461,10 @@
+--- configure.orig	2020-11-28 11:54:35 UTC
++++ configure
+@@ -5696,10 +5696,10 @@ host_os3=`echo $host_os2 | sed 's/^\([^0-9]*\)[0-9]*$/
  host_cpu1=`echo $host_cpu | sed 's/\./_/g'`
  host_vendor1=`echo $host_vendor | sed 's/\./_/g'`
  HOST_ID="-DCPU_$host_cpu1 -DVENDOR_$host_vendor1 -DOS_$host_os1"
@@ -13,8 +13,8 @@
  	HOST_ID="$HOST_ID -DOS_$host_os3"
  fi
  
-@@ -2490,44 +2490,44 @@
-     fi	
+@@ -5725,39 +5725,39 @@ if [ "X$GCC" = "Xyes" ] ; then
+     esac
      CFLAGS="$CFLAGS $Wall"
  else
 -    if [ $host_os3 = hpux ] ; then
@@ -33,12 +33,6 @@
  	    LDFLAGS="$LDFLAGS -z"
  fi
  
- 
--if [ $host_vendor = linux ] ; then
-+if [ "$host_vendor" = linux ] ; then
-     LDFLAGS="$LDFLAGS -z"
- fi
- 
 -if [ $host_os3 = xenix ] ; then
 +if [ "$host_os3" = xenix ] ; then
      LDFLAGS="$LDFLAGS -M2e -i -f 5000"
diff --git a/emulators/mtools/files/patch-c b/emulators/mtools/files/patch-mtools.texi
index eac7d023f3f2..02360f495ddc 100644
--- a/emulators/mtools/files/patch-c
+++ b/emulators/mtools/files/patch-mtools.texi
@@ -1,6 +1,6 @@
---- mtools.texi.orig	2009-02-20 05:48:30.000000000 +0900
-+++ mtools.texi	2009-02-20 22:04:41.000000000 +0900
-@@ -36,7 +36,7 @@
+--- mtools.texi.orig	2020-11-26 23:02:51 UTC
++++ mtools.texi
+@@ -39,7 +39,7 @@ mtools - utilities to access DOS disks in Unix.
  
  @dircategory DOS
  @direntry
diff --git a/emulators/mtools/files/patch-f b/emulators/mtools/files/patch-scsi.c
index b100e9cebec7..c0338b7ed945 100644
--- a/emulators/mtools/files/patch-f
+++ b/emulators/mtools/files/patch-scsi.c
@@ -1,6 +1,6 @@
---- scsi.c.orig	Tue Mar 16 03:11:18 1999
-+++ scsi.c	Sat Feb 26 00:48:35 2000
-@@ -49,7 +49,7 @@
+--- scsi.c.orig	2018-12-02 16:23:26 UTC
++++ scsi.c
+@@ -62,7 +62,7 @@
  #include <sys/scsicmd.h>
  #endif
  
@@ -9,16 +9,16 @@
  #include <camlib.h>
  #endif
  
-@@ -64,7 +64,7 @@
- 
- int scsi_open(const char *name, int flag, int mode, void **extra_data)
+@@ -82,7 +82,7 @@ int scsi_max_length(void)
+ int scsi_open(const char *name, int flag UNUSEDP, int mode UNUSEDP,
+ 	      void **extra_data UNUSEDP)
  {
 -#if (defined(OS_freebsd)) && (__FreeBSD__ >= 2)
 +#if (defined(OS_freebsd)) && (__FreeBSD__ >= 3)
      struct cam_device *cam_dev;
      cam_dev = cam_open_device(name, O_RDWR);
      *extra_data = (void *) cam_dev;
-@@ -224,7 +224,7 @@
+@@ -245,7 +245,7 @@ int scsi_cmd(int fd, unsigned char *cdb, int cmdlen, s
          }
          
          return 0;
@@ -27,4 +27,3 @@
  #define MSG_SIMPLE_Q_TAG 0x20 /* O/O */
        union ccb *ccb;
        int flags;
-
diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist
index 417a4745d836..cf1312cd3810 100644
--- a/emulators/mtools/pkg-plist
+++ b/emulators/mtools/pkg-plist
@@ -29,6 +29,7 @@ bin/mtoolstest
 bin/mtype
 bin/mxtar
 bin/mzip
+bin/mshortname
 %%X11%%man/man1/floppyd.1.gz
 %%X11%%man/man1/floppyd_installtest.1.gz
 man/man1/mattrib.1.gz
@@ -56,5 +57,6 @@ man/man1/mtools.1.gz
 man/man1/mtoolstest.1.gz
 man/man1/mtype.1.gz
 man/man1/mzip.1.gz
+man/man1/mshortname.1.gz
 man/man5/mtools.5.gz
 @sample etc/mtools.conf.sample