From nobody Sat May 06 11:34:33 2023 X-Original-To: dev-commits-ports-main@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 4QD57F5Yj3z49T8Q; Sat, 6 May 2023 11:34:33 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QD57F54Rmz46G9; Sat, 6 May 2023 11:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683372873; 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=wyttBBBDG4UJDFuCT3I4WUu6N4Sbr4f+opCovuvTlRs=; b=cPYNO4eJKLT9tpYEcKoVwi+aq3TKwdQypO/m10sbTlC9WW08oo51Xa1c0WuwvUgvMrdIbs X7mmC3Je+BFjP+XT4OXGTTygD4t8ZWVQxZuSX9f0hr9SvABL3ym4N3sTtf0W0rpAJhDrgP u/8KsbsDvkeERg7YQRvRpc8C4UVUxgVEFSmV8ArRZ/qrBtksJXhCmbjucRltL5sP5GZ6DT SCLNISIYlOSFqwVlESI4piDyzUIHq0tADmWTA8iFjdDkQNVMvP1YGpNxG47/aNfTVLyDT8 WeYEBzin0l17/rG9WRxHQRz7TJrBW54eWAqOqiF6aUcIu8zSxNpUE0si8gjkfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683372873; 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=wyttBBBDG4UJDFuCT3I4WUu6N4Sbr4f+opCovuvTlRs=; b=xRTwsi7Gb7thuAIOJU1M64Jdadw+zWCafzvkMnNFAIcde2ghFYcWE8PtoRVt+PudqgELL+ DQ2fy5pKo9Er40iMPsMdspuGx1oSR8A/0b/0WYy6pQMuKGDCEE0yht8tP1PCKsSHXHvFCL gFXQfZEX20yKi0wqU207oPHSIS7xTuh0w8nbbsX4rFavIx3kqkUkV/ntzPZlEDYfy0jqhU xMW9FXn0RqAmtjIwlLyW3iFFdRAd+SiWJvbB5n8jhUtUptuaigG6v82DNu1PLkDjpNH/j7 jEND+NkwBETIlVwez4QVhI9fPJ2Ys0WuDzeyI0QIDd32H4nLr4aDslHxlP6e6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683372873; a=rsa-sha256; cv=none; b=VT/bWrR8QxgIAgCakOzFIwzCPtNQVSlNL8zDhXB2hzhiFjMZDo4s1nznT743cgyLKkUU37 pKUv7tgDTFafgMRyb9p5moPH5Bek+6OTBtWp26Zwk6XkrnvaFRHi4wcNjI8iJ9yNRusjB0 Y/S781F3Q1rz9rtpxwrU5/z3bmsLSwOxeRDVplyfLajo+lQT6v9nY0acywc/554g3ztPOt rYh3KUbq5idWmvjPZ+W6Yg5PSYJU71EJwtiJsEQvenhwzWne2Xm1q0rmXa8tWKv+JFlwMz /64CPq61/bymi9XyjT6SS7qtHwgze2/0PoCJgIcpN9QqRZt3nNaYTIZN3oOPlg== 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 4QD57F48VCzZpk; Sat, 6 May 2023 11:34:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 346BYXXF007692; Sat, 6 May 2023 11:34:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 346BYXYv007691; Sat, 6 May 2023 11:34:33 GMT (envelope-from git) Date: Sat, 6 May 2023 11:34:33 GMT Message-Id: <202305061134.346BYXYv007691@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: b13d37256e21 - main - emulators/mtools: update GNU mtools to version 4.0.43 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: b13d37256e21c87eda7d8de1eba7c74ffea0b415 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=b13d37256e21c87eda7d8de1eba7c74ffea0b415 commit b13d37256e21c87eda7d8de1eba7c74ffea0b415 Author: Alexey Dokuchaev AuthorDate: 2023-05-06 11:34:00 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-05-06 11:34:00 +0000 emulators/mtools: update GNU mtools to version 4.0.43 Via: https://www.linux.org.ru/news/gnu/17168036 --- emulators/mtools/Makefile | 16 ++++------------ emulators/mtools/distinfo | 6 +++--- emulators/mtools/files/patch-Makefile.in | 33 ++++++++++++++------------------ emulators/mtools/pkg-plist | 2 -- 4 files changed, 21 insertions(+), 36 deletions(-) diff --git a/emulators/mtools/Makefile b/emulators/mtools/Makefile index b0d76847f753..f96846f1da42 100644 --- a/emulators/mtools/Makefile +++ b/emulators/mtools/Makefile @@ -1,6 +1,5 @@ PORTNAME= mtools -PORTVERSION= 4.0.26 -PORTREVISION= 1 +PORTVERSION= 4.0.43 CATEGORIES= emulators MASTER_SITES= GNU @@ -12,7 +11,7 @@ LICENSE= GPLv3 CONFLICTS_INSTALL= multimarkdown -USES= gmake makeinfo tar:bzip2 +USES= gmake makeinfo tar:lz GNU_CONFIGURE= yes CONFIGURE_ENV= ac_cv_header_malloc_h=no CONFIGURE_ARGS= --enable-xdf @@ -46,17 +45,10 @@ MAKE_ENV+= WITHOUT_X11=yes .endif post-patch: - @${REINPLACE_CMD} -e \ - 's|^#define MT_SIZE_T size_t|#define MT_SIZE_T off_t|g' \ - ${WRKSRC}/llong.h - @${REINPLACE_CMD} -e 's|/etc/mtools.conf|${PREFIX}/etc/mtools.conf|g' \ - ${WRKSRC}/mformat.c + @${REINPLACE_CMD} -e '/LOCAL_CONF_FILE/s,/etc/default,${LOCALBASE}/etc,' \ + ${WRKSRC}/mtoolsPaths.h @${REINPLACE_CMD} -e 's|^\(SAMPLE FILE\)$$|#\1|' \ ${WRKSRC}/mtools.conf -.for f in mtools.5 mtools.texi - @${REINPLACE_CMD} -e 's|/usr/local/etc/|${PREFIX}/etc/|g' \ - ${WRKSRC}/${f} -.endfor post-install: ${INSTALL_DATA} ${WRKSRC}/mtools.conf ${STAGEDIR}${PREFIX}/etc/mtools.conf.sample diff --git a/emulators/mtools/distinfo b/emulators/mtools/distinfo index 60eb44a53314..fdded9f52cc2 100644 --- a/emulators/mtools/distinfo +++ b/emulators/mtools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1610672966 -SHA256 (mtools-4.0.26.tar.bz2) = 539f1c8b476a16e198d8bcb10a5799e22e69de49d854f7dbd85b64c2a45dea1a -SIZE (mtools-4.0.26.tar.bz2) = 420648 +TIMESTAMP = 1679438048 +SHA256 (mtools-4.0.43.tar.lz) = 997ffe4125a19de1fd433ed63f128f7d54bc1a5915f3cdb36da6491ef917f217 +SIZE (mtools-4.0.43.tar.lz) = 383347 diff --git a/emulators/mtools/files/patch-Makefile.in b/emulators/mtools/files/patch-Makefile.in index 10f1b3544da0..7172fd00b479 100644 --- a/emulators/mtools/files/patch-Makefile.in +++ b/emulators/mtools/files/patch-Makefile.in @@ -1,30 +1,25 @@ ---- Makefile.in.orig 2018-12-09 19:54:34 UTC +--- Makefile.in.orig 2022-10-09 09:55:19 UTC +++ Makefile.in -@@ -72,10 +72,13 @@ INSTALL_INFO = @INSTALL_INFO@ - .SUFFIXES: .o .c - .SUFFIXES: .o .c - --MAN1 = floppyd.1 floppyd_installtest.1 mattrib.1 mbadblocks.1 mcat.1 mcd.1 \ -+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 mshortname.1 mshowfat.1 mtoolstest.1 mtools.1 mtype.1 mzip.1 +@@ -77,6 +77,9 @@ 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 +ifndef WITHOUT_X11 -+MAN1 += floppyd.1 floppyd_installtest.1 ++MAN1 += floppyd.1 floppyd_installtest.1 +endif - MAN1EXT = 1 - MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} - MAN5 = mtools.5 -@@ -133,7 +136,7 @@ scsi.c signal.c stream.c streamcache.c subdir.c unixdi - xdf_io.c mkmanifest.c + MAN1EXT = 1 + MAN1DIR = $(DESTDIR)$(mandir)/man${MAN1EXT} +@@ -119,7 +122,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 mclasserase mcopy mdel mdeltree mdir mdu mformat minfo \ - mlabel mmd mmount mmove mpartition mrd mren mtype mtoolstest mshortname \ -@@ -278,11 +281,11 @@ install-links: $(DESTDIR)$(bindir)/mtools + 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 install-scripts: $(DESTDIR)$(bindir)/mtools @$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir) @for j in $(SCRIPTS) ; do \ diff --git a/emulators/mtools/pkg-plist b/emulators/mtools/pkg-plist index cf1312cd3810..759a2147e699 100644 --- a/emulators/mtools/pkg-plist +++ b/emulators/mtools/pkg-plist @@ -6,7 +6,6 @@ bin/mbadblocks bin/mcat bin/mcd bin/mcheck -bin/mclasserase bin/mcomp bin/mcopy bin/mdel @@ -36,7 +35,6 @@ man/man1/mattrib.1.gz man/man1/mbadblocks.1.gz man/man1/mcat.1.gz man/man1/mcd.1.gz -man/man1/mclasserase.1.gz man/man1/mcopy.1.gz man/man1/mdel.1.gz man/man1/mdeltree.1.gz