Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 38AC184F00 for ; Fri, 21 Jul 2023 00:00:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 6u0Bt4GYTWGe for ; Fri, 21 Jul 2023 00:00:30 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 9AE1B84D3E for ; Fri, 21 Jul 2023 00:00:30 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 942E1FBDB; Fri, 21 Jul 2023 00:00:30 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1689897630257270" MIME-Version: 1.0 Date: Fri, 21 Jul 2023 00:00:30 +0000 From: "Jason R Thorpe" Subject: CVS commit: pkgsrc/cross/lwtools To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: thorpej@netbsd.org X-Mailer: log_accum Message-Id: <20230721000030.942E1FBDB@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1689897630257270 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: thorpej Date: Fri Jul 21 00:00:30 UTC 2023 Modified Files: pkgsrc/cross/lwtools: distinfo pkgsrc/cross/lwtools/patches: patch-Makefile Log Message: Re-do that last change differently -- don't use the -w argument at all. Instead, specify the arguments the old school way. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 pkgsrc/cross/lwtools/distinfo cvs rdiff -u -r1.2 -r1.3 pkgsrc/cross/lwtools/patches/patch-Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1689897630257270 Content-Disposition: inline Content-Length: 1809 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/cross/lwtools/distinfo diff -u pkgsrc/cross/lwtools/distinfo:1.2 pkgsrc/cross/lwtools/distinfo:1.3 --- pkgsrc/cross/lwtools/distinfo:1.2 Thu Jul 20 22:02:46 2023 +++ pkgsrc/cross/lwtools/distinfo Fri Jul 21 00:00:30 2023 @@ -1,6 +1,6 @@ -$NetBSD: distinfo,v 1.2 2023/07/20 22:02:46 thorpej Exp $ +$NetBSD: distinfo,v 1.3 2023/07/21 00:00:30 thorpej Exp $ BLAKE2s (lwtools-4.19.tar.gz) = 3b474babce2a1895c9bf5535aa9ce55fcaed0b0c52ccfaf4d24657c6fa0c0270 SHA512 (lwtools-4.19.tar.gz) = 9bb09a018969ddf70eee8fe7f3572798718bc9eee4cdd74c252ffadb741282e5822fab0a7595f2e568566086293c4ca70c84855c2d3796f4458bacdfcd187b68 Size (lwtools-4.19.tar.gz) = 657929 bytes -SHA1 (patch-Makefile) = c3f807de5d7a25a80b423af1ff9c6d4eb90db888 +SHA1 (patch-Makefile) = 479b576ee1a5c302d70ea0244138360cdcae149e Index: pkgsrc/cross/lwtools/patches/patch-Makefile diff -u pkgsrc/cross/lwtools/patches/patch-Makefile:1.2 pkgsrc/cross/lwtools/patches/patch-Makefile:1.3 --- pkgsrc/cross/lwtools/patches/patch-Makefile:1.2 Thu Jul 20 22:02:46 2023 +++ pkgsrc/cross/lwtools/patches/patch-Makefile Fri Jul 21 00:00:30 2023 @@ -1,4 +1,4 @@ -$NetBSD: patch-Makefile,v 1.2 2023/07/20 22:02:46 thorpej Exp $ +$NetBSD: patch-Makefile,v 1.3 2023/07/21 00:00:30 thorpej Exp $ Use portable arguments to fmt(1). @@ -9,7 +9,7 @@ Use portable arguments to fmt(1). @mv -f $*.d $*.d.tmp @sed -e 's|.*:|$*.o $*.d:|' < $*.d.tmp > $*.d - @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d -+ @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt -w 1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d ++ @sed -e 's/.*://' -e 's/\\$$//' < $*.d.tmp | fmt 0 1 | sed -e 's/^ *//' -e 's/$$/:/' >> $*.d @rm -f $*.d.tmp @echo Building $@ @$(CC) $(CPPFLAGS) $(CFLAGS) -o $@ -c $< --_----------=_1689897630257270--