filesystems/mtools: update the port to the latest version 4.0.48

While here, adjust LICENSE (GPLv3 or later), respect PREFIX more,
wrap one very long line, and install useful documentation files.
This commit is contained in:
Alexey Dokuchaev 2025-04-15 15:08:52 +00:00
parent c0c563cbe2
commit 90baa2b976
3 changed files with 27 additions and 21 deletions

View file

@ -1,5 +1,5 @@
PORTNAME= mtools
PORTVERSION= 4.0.47
PORTVERSION= 4.0.48
CATEGORIES= filesystems emulators
MASTER_SITES= GNU
@ -7,7 +7,7 @@ MAINTAINER= skreuzer@FreeBSD.org
COMMENT= Tools for manipulating MS-DOS disks and images
WWW= https://www.gnu.org/software/mtools/intro.html
LICENSE= GPLv3
LICENSE= GPLv3+
CONFLICTS_INSTALL= multimarkdown
@ -19,8 +19,9 @@ CONFIGURE_ARGS= --enable-xdf
SUB_FILES= pkg-message
INFO= mtools
PORTDOCS= NEWS README Release.notes
OPTIONS_DEFINE= ICONV X11
OPTIONS_DEFINE= DOCS ICONV X11
OPTIONS_DEFAULT=ICONV X11
.include <bsd.port.options.mk>
@ -45,11 +46,16 @@ MAKE_ENV+= WITHOUT_X11=yes
.endif
post-patch:
@${REINPLACE_CMD} -e '/LOCAL_CONF_FILE/s,/etc/default,${LOCALBASE}/etc,' \
@${REINPLACE_CMD} -e '/LOCAL_CONF_FILE/s,/etc/default,${PREFIX}/etc,' \
${WRKSRC}/mtoolsPaths.h
@${REINPLACE_CMD} -e '/^SAMPLE FILE/s,^,#,' ${WRKSRC}/mtools.conf
post-install:
${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample
${INSTALL_DATA} ${WRKSRC}/mtools.conf \
${STAGEDIR}${PREFIX}/etc/mtools.conf.sample
post-install-DOCS-on:
@${MKDIR} ${STAGEDIR}${DOCSDIR}
${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
.include <bsd.port.mk>

View file

@ -1,3 +1,3 @@
TIMESTAMP = 1737275818
SHA256 (mtools-4.0.47.tar.lz) = 2709cd2f42d65500829b056cb0630edd515d7060b4865bad31277f0da9f9e9d5
SIZE (mtools-4.0.47.tar.lz) = 391656
TIMESTAMP = 1740239375
SHA256 (mtools-4.0.48.tar.lz) = 7d57f14a2482dc4658e4b386180793ef50f0de89ee3a9a28f0a371630baac7c4
SIZE (mtools-4.0.48.tar.lz) = 396333

View file

@ -1,32 +1,32 @@
--- Makefile.in.orig 2024-11-30 22:13:06 UTC
--- Makefile.in.orig 2025-02-05 12:30:43 UTC
+++ Makefile.in
@@ -72,11 +72,14 @@ INSTALL_INFO = @INSTALL_INFO@
@@ -71,11 +71,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 \
-MAN1A = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 \
+MAN1A = mattrib.1 mbadblocks.1 mcat.1 \
mcd.1 mcopy.1 mdel.1 mdeltree.1 mdir.1 mdoctorfat.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 \
mrd.1 mren.1 mshortname.1 mshowfat.1 mtoolstest.1 mtype.1 \
mzip.1
+ifndef WITHOUT_X11
+MAN1 += floppyd.1 floppyd_installtest.1
+MAN1A += floppyd.1 floppyd_installtest.1
+endif
MAN1EXT = 1
MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT}
@@ -119,7 +122,7 @@ privileges.c remap.c scsi_io.c scsi.c signal.c stream.
MAN1 = ${MAN1A} mtools.1
@@ -120,7 +123,7 @@ privileges.c remap.c scsi_io.c scsi.c signal.c stream.
swap.c unix2dos.s unixdir.c tty.c vfat.c mkmanifest.c \
@FLOPPYD_IO_SRC@ @XDF_IO_SRC@
-SCRIPTS = mcheck mxtar uz tgz mcomp amuFormat.sh
+SCRIPTS = mcheck mxtar mcomp amuFormat.sh
LINKS=mattrib mcat mcd mcopy mdel mdeltree mdir mdoctorfat mdu \
mformat minfo mlabel mmd mmount mmove mpartition mrd mren mtype \
@@ -264,11 +267,9 @@ install-links: $(DESTDIR)$(bindir)/mtools
install-scripts: $(DESTDIR)$(bindir)/mtools
LINKS=mattrib$(EXEEXT) mcat$(EXEEXT) mcd$(EXEEXT) mcopy$(EXEEXT) mdel$(EXEEXT) \
mdeltree$(EXEEXT) mdir$(EXEEXT) mdoctorfat$(EXEEXT) mdu$(EXEEXT) \
@@ -267,11 +270,9 @@ install-links: $(DESTDIR)$(bindir)/mtools$(EXEEXT)
install-scripts: $(DESTDIR)$(bindir)/mtools$(EXEEXT)
@$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
@for j in $(SCRIPTS) ; do \
- $(INSTALL_PROGRAM) $(srcdir)/scripts/$$j $(DESTDIR)$(bindir)/$$j ; \