git: e8418c8e8a0e - main - emulators/mtools: fix the patch, COMMENT, and port description

From: Alexey Dokuchaev <danfe_at_FreeBSD.org>
Date: Thu, 11 May 2023 08:34:29 UTC
The branch main has been updated by danfe:

URL: https://cgit.FreeBSD.org/ports/commit/?id=e8418c8e8a0ea4bdeb459afa2584a94d67f8866d

commit e8418c8e8a0ea4bdeb459afa2584a94d67f8866d
Author:     Alexey Dokuchaev <danfe@FreeBSD.org>
AuthorDate: 2023-05-11 08:33:32 +0000
Commit:     Alexey Dokuchaev <danfe@FreeBSD.org>
CommitDate: 2023-05-11 08:33:32 +0000

    emulators/mtools: fix the patch, COMMENT, and port description
    
    - Add back the patch hunk lost in commit b13d37256e21 (luckily,
      this did not affect packaging in any way)
    - Clarify the COMMENT and shorten it for the benefit of ``pkg
      search ^mtools'' fitting the standard 80-character terminal
    - Reformat port description, spell abbreviations properly, etc.
---
 emulators/mtools/Makefile                |  2 +-
 emulators/mtools/files/patch-Makefile.in | 12 ++++++++----
 emulators/mtools/pkg-descr               |  7 ++++---
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile
index f96846f1da42..97abb4b555a9 100644
--- a/emulators/mtools/Makefile
+++ b/emulators/mtools/Makefile
@@ -4,7 +4,7 @@ CATEGORIES=	emulators
 MASTER_SITES=	GNU
 
 MAINTAINER=	skreuzer@FreeBSD.org
-COMMENT=	Collection of tools for manipulating MS-DOS files
+COMMENT=	Tools for manipulating MS-DOS disks and images
 WWW=		https://www.gnu.org/software/mtools/intro.html
 
 LICENSE=	GPLv3
diff --git a/emulators/mtools/files/patch-Makefile.in b/emulators/mtools/files/patch-Makefile.in
index 7172fd00b479..1c9d84b0e764 100644
--- a/emulators/mtools/files/patch-Makefile.in
+++ b/emulators/mtools/files/patch-Makefile.in
@@ -1,6 +1,12 @@
 --- Makefile.in.orig	2022-10-09 09:55:19 UTC
 +++ Makefile.in
-@@ -77,6 +77,9 @@ mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdu.1 mformat.1
+@@ -72,11 +72,14 @@ INSTALL_INFO	= @INSTALL_INFO@
+ .SUFFIXES: .o .c
+ .SUFFIXES: .o .c
+ 
+-MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1	\
++MAN1 = mattrib.1 mbadblocks.1 mcat.1	\
+ mcd.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 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1	\
  mzip.1
@@ -19,7 +25,7 @@
  
  LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdu	\
  mformat minfo mlabel mmd mmount mmove mpartition mrd mren mtype	\
-@@ -264,11 +267,11 @@ install-links: $(DESTDIR)$(bindir)/mtools
+@@ -264,11 +267,9 @@ install-links: $(DESTDIR)$(bindir)/mtools
  install-scripts: $(DESTDIR)$(bindir)/mtools
  	@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
  	@for j in $(SCRIPTS) ; do \
@@ -29,8 +35,6 @@
  	done
 -	rm -f $(DESTDIR)$(bindir)/lz
 -	cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
-+	#rm -f $(DESTDIR)$(bindir)/lz
-+	#cd $(DESTDIR)$(bindir) && $(LN_S) uz lz
  
  install-man:
  	@$(top_srcdir)/mkinstalldirs $(MAN1DIR)
diff --git a/emulators/mtools/pkg-descr b/emulators/mtools/pkg-descr
index 45977f704ef8..5ab285231a70 100644
--- a/emulators/mtools/pkg-descr
+++ b/emulators/mtools/pkg-descr
@@ -1,3 +1,4 @@
-Mtools is a collection of utilities for accessing MS-DOS disks from Unix without
-mounting them. It supports Win95 style long file names, OS/2 Xdf disks, ZIP/JAZ
-disks, and 2m disks (store up to 1992k on a high density 3 1/2" disk).
+Mtools is a collection of utilities for accessing MS-DOS disks and file
+system images from Unix without mounting them.  It supports Win95-style
+long file names, OS/2 XDF-formatted disks, ZIP/JAZ disks, and 2MB disks
+(store up to 1992kB on a high-density 3.5" diskette).