From nobody Mon Oct 3 06:01:55 2022 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 4Mgqwl6G3Jz4VB3v; Mon, 3 Oct 2022 06:01:59 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Mgqwl5rwLz3R5h; Mon, 3 Oct 2022 06:01:59 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664776919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3795gjYD1BYSBeKGhUs+akAuv5vfbuKHvHVn/3U1V6Y=; b=T/9Lj/sn1C8PmzZsvkPzcae03TA50m8QeNLol32aHR2hhTh3/irtj/NVZTPItrms3B7rtP MY23//iGbZkDZnp6yqOkyksTV9um7X8QT+kIODSgXSX1uIizm6GlrBxhxgukBLeRpo5LzP t9yjlHh0RWtbU9dHLI/TjGEIn6bfoljPGfjdcjT10EOj+4KXpnSXMQlblsjsSL4GhiW27f EdOfb5OoXlPOBsnl+rbjK2F09lSoKDGBs6xNYyqydpqD8DDDAujB+k21yD5B17ah+d6fhO 8L+FGStJ978nOh3ycOEr/BbbgTR5qFSfhaotonWvbVYohsz2FHPmO8R1xcFUuw== Received: from beaver (unknown [IPv6:2a02:169:175:0:12bf:48ff:fee1:88e]) (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) (Authenticated sender: ehaupt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Mgqwk6TFmz1GL3; Mon, 3 Oct 2022 06:01:58 +0000 (UTC) (envelope-from ehaupt@FreeBSD.org) Date: Mon, 3 Oct 2022 08:01:55 +0200 From: Emanuel Haupt To: Po-Chuan Hsieh Cc: Emanuel Haupt , ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org, Adam Weinberger Subject: Re: git: 17f1bb50e42a - main - shells/bash: Fix pkg-plist when NLS is turned off Message-Id: <20221003080155.b12f4418d3a7bad7a42585b7@FreeBSD.org> In-Reply-To: References: <202210010705.29175Dvs065759@gitrepo.freebsd.org> X-Mailer: Sylpheed 3.7.0 (GTK+ 2.24.33; amd64-portbld-freebsd13.0) 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=US-ASCII Content-Transfer-Encoding: 7bit ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664776919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3795gjYD1BYSBeKGhUs+akAuv5vfbuKHvHVn/3U1V6Y=; b=xEVkY5wxPlRl+1T2vZZP/5sgYWCiC54s5KUrDFu4CHsv7LpERiakTJD9d8UvjAJW017zzQ YhNkvi/E9hpb61wzT3BrvWdWRBVQ1ETJRGGYsl9KjfuHBtWa8SLQGSLkvNFy084urqs4MI GVZ1uh/npVeo/2c2PIucv71YvFIpiEVqnPLKmDOti3XyJVVw9XFBKfDUaCiar6IIU7Bges Uj/PGqU9wE3EiuOqO7/iogH2Zj4IT9teVIb7TjwAARezSFLhp2R5o95JwN/oyRoehMQPdF PssoD8Ioc8PjWwIWM69mU/Zd7VRRuvhKH+zxdXtsIOUj6mTnjXJNByGx3ffe7A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664776919; a=rsa-sha256; cv=none; b=Y1pff2NXgJIV+DMhlu5fBM2h2i8tnSItV9U7mcA2fc7jFnKfYxugvr2UImf5Fc5dOQWclI ylj1Lw8BfEx+HlCvRHwvFrnIYzMTmMAGYM+K5qkdddZJC+4bTjA1O13z3nb1ycthmPPWLj 237Pitj4sWjpLeeqIA5JzgYh8wPgQgqXANFmBTF6zaAclfDZl3g/hNMEu1niOF5SQ9HsB6 lxanh1SjaLLqg8A/C8ApWKLSOfPOnz/8t2XjbThjV6lbyFcmIb5c7tgplbzlMpEaO+aSdF xbcdOfQzgUiK+byspUe/jXVexZHl4s0t5jhE2yx2FgHMgRsHfQGlqKy3o/dfmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N Po-Chuan Hsieh wrote: > On Sat, Oct 1, 2022 at 3:05 PM Emanuel Haupt > wrote: > > > The branch main has been updated by ehaupt: > > > > URL: > > https://cgit.FreeBSD.org/ports/commit/?id=17f1bb50e42a45dc64fc898cd9cae905d7262bda > > > > commit 17f1bb50e42a45dc64fc898cd9cae905d7262bda > > Author: Emanuel Haupt > > AuthorDate: 2022-10-01 07:05:08 +0000 > > Commit: Emanuel Haupt > > CommitDate: 2022-10-01 07:05:08 +0000 > > > > shells/bash: Fix pkg-plist when NLS is turned off > > > > Hello, > > I thought the NLS issue was already fixed in > cc83ec0f744fb159bd48303d15c09aa0c6cb38a4 by Adam. Could you please > check again? > > Furthermore, the PLIST change is incorrect. The NLS option does not > affect the existence of header files in ${PREFIX}/include/bash/ and > binaries in ${PREFIX}/lib/bash/. I've prepared a patch [1] to revert > the PLIST change and also fix the PLIST order (incorrectly changed > in 34393efcc244fe0d4e76a8e12ae343decdf0b083). Please take a look. > Thanks. You are correct. Adam's more elegant fix (cc83ec0f744fb159bd48303d15c09aa0c6cb38a4) clashed with mine (17f1bb50e42a45dc64fc898cd9cae905d7262bda). > [1] https://people.FreeBSD.org/~sunpoet/patch/shells-bash.txt I'll commit your patch shortly (including cherry-pick to quarterly). Thank you!