From nobody Tue Apr 15 15:09:48 2025 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZcSHx0MXNz5tJ0b; Tue, 15 Apr 2025 15:09:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZcSHw6Rbwz3XMx; Tue, 15 Apr 2025 15:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744729788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eBov5oR5A1wYFivd/jFxIbewUfFRW6t7NDnyUxUm5e4=; b=Ld8BRc2rxshMaIP8VS0dWGb7ecWtly+28ggK0QAs2Ao5kgXy+d6QSdaxaBOJ+LNcz87akk t0jI3ivm48r7PSfOyq6L7kiS1dm3KMN3dvFTUi9ofmcV9qyn+Bob1raGyqbYaJ/xHqb7Zy Y4l+OEU+RBaXm1KeWfyznKH35MiX5c0fcJ6IZA10EXIPKsd5EykTtGLFDKjKXcbKRJ7MLd XtRqv76nCZOMEUiviMTU8GDFkaiTaT/g9IT9Z2ETIflIjaDfnzXINTLWtfZqbNfSKmDBGi 56F4u2giwJYH9Dv3I+/PIDj28HM2VQ4rlpthiLYHhZnp63PM3xbEvmrxISe4ng== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744729788; a=rsa-sha256; cv=none; b=bQYtiPFYBwAOq4e5jKHCu4I64NAp9Vdbyg1w7sO7ZScTp3vOVn/7Lq7Hz4mvJHPpD3WERg pd6Dop6xxQ5f57K3mfCEmRPRu/ddinWBfOBiv/+RY1j5+7/iAaPhhQEdiPp8rrltFMI9ER 7CIjqqw3QapO7Sf0SbPoax4NlAz4VPlznS12im+s2R06ekYVvTDVe9HHbj0Ornil+HBy+R swC0+6/PLcUw0zie++H4Crr8DMQc2FqSH6oDGV6AKbJwgPYgxCN1sfBFmHY9vVfvRHLM46 ziIcrtNSR1FJIIRxROTPMYnze0JcVbNAV77jr3M4Vft2kuXH+uh73hns2mZajA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744729788; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eBov5oR5A1wYFivd/jFxIbewUfFRW6t7NDnyUxUm5e4=; b=T/v8I+amhCZOkmzUVOdUd5lYbYrnRTuJuwXtyPbUg1/jya+cPwSaeHDIptGTI/g0+A8elT BCtAuvdcVtQfUYeSF/IvwnRhq0fLlSQ9iryC6Kq3n6Ojr+SRgLyHEOGGNru4x5x2px57qw EvHtEK2eObf2HCVrXecgZ/EA1/CNFilg/YGamCT5SQ8IjLW75pNI3+m6/pvSUwiIJ4nmOF FTWWxHCV06r7YkwN4n1bG0RhKfr1AYN2W1mqyyZvnt81GLLtUtr9SfcSt6bbJWKHP705kQ +9tYclZhAhz7WTc4NY5bOT2yPGDx0pi6IUwzmu1OW7uNPv3SITIr2o0m+CFUBw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZcSHw5fnYzfk9; Tue, 15 Apr 2025 15:09:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53FF9mwi042454; Tue, 15 Apr 2025 15:09:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53FF9miR042450; Tue, 15 Apr 2025 15:09:48 GMT (envelope-from git) Date: Tue, 15 Apr 2025 15:09:48 GMT Message-Id: <202504151509.53FF9miR042450@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 90baa2b97650 - main - filesystems/mtools: update the port to the latest version 4.0.48 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 90baa2b976506d40381029fec4b92b8bd28a712c Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=90baa2b976506d40381029fec4b92b8bd28a712c commit 90baa2b976506d40381029fec4b92b8bd28a712c Author: Alexey Dokuchaev AuthorDate: 2025-04-15 15:08:52 +0000 Commit: Alexey Dokuchaev CommitDate: 2025-04-15 15:08:52 +0000 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. --- filesystems/mtools/Makefile | 16 +++++++++++----- filesystems/mtools/distinfo | 6 +++--- filesystems/mtools/files/patch-Makefile.in | 26 +++++++++++++------------- 3 files changed, 27 insertions(+), 21 deletions(-) diff --git a/filesystems/mtools/Makefile b/filesystems/mtools/Makefile index 0acfa890d644..38f12649be0f 100644 --- a/filesystems/mtools/Makefile +++ b/filesystems/mtools/Makefile @@ -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 @@ -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 diff --git a/filesystems/mtools/distinfo b/filesystems/mtools/distinfo index f56ccce6871e..9dabd9a24bc0 100644 --- a/filesystems/mtools/distinfo +++ b/filesystems/mtools/distinfo @@ -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 diff --git a/filesystems/mtools/files/patch-Makefile.in b/filesystems/mtools/files/patch-Makefile.in index 56b372653f16..5b3751a4179e 100644 --- a/filesystems/mtools/files/patch-Makefile.in +++ b/filesystems/mtools/files/patch-Makefile.in @@ -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 ; \