From nobody Mon Oct  3 03:33:58 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 4Mgmfh469xz4fJTl
	for <dev-commits-ports-main@mlmmj.nyi.freebsd.org>; Mon,  3 Oct 2022 03:34:36 +0000 (UTC)
	(envelope-from sunpoet@freebsd.org)
Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4])
	(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 4Mgmfh3X42z3H97
	for <dev-commits-ports-main@freebsd.org>; Mon,  3 Oct 2022 03:34:36 +0000 (UTC)
	(envelope-from sunpoet@freebsd.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
	t=1664768076;
	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:
	 in-reply-to:in-reply-to:references:references;
	bh=b8p4B1Vrkm8lVOQvQW08Yonnm3sGmYsZJRMIqw1tVUU=;
	b=sICMyYilNMTY61qYuy4A8zm0a8pjOmL7KpXJnWh+VarI2+E1m0VJ13p8x/nJdYI2wgtoLZ
	fTc9v5BCa69wpBZBBDrR1vLw6079hQLpqrLvi9kFvo37N6jP8uLvBemV3zB/Kwtrm9mZKE
	16yVUHNQGl+Ac311qXsV9DYAyTR/fZBXIuJaMn5vVVqUBPDL/GyWsx4I3/xgRqQ0cBtO0g
	0MZTM7FP2OVsC5eZiTivveVV8wQCeYCokCSAqeAaKqR65pYOxPEX4cC9CiXVBnxYAIS0Wb
	fyBMfO5ytbynEbqyM54QdnkV2jtrJMLzXDuO8qpf01O+zhb7lCBMKHPlPg7UeQ==
Received: from mail-pg1-f169.google.com (mail-pg1-f169.google.com [209.85.215.169])
	(using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits)
	 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
	 client-signature RSA-PSS (2048 bits) client-digest SHA256)
	(Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK))
	(Authenticated sender: sunpoet)
	by smtp.freebsd.org (Postfix) with ESMTPSA id 4Mgmfh2Fc3z1G0y
	for <dev-commits-ports-main@freebsd.org>; Mon,  3 Oct 2022 03:34:36 +0000 (UTC)
	(envelope-from sunpoet@freebsd.org)
Received: by mail-pg1-f169.google.com with SMTP id a23so976877pgi.10
        for <dev-commits-ports-main@freebsd.org>; Sun, 02 Oct 2022 20:34:36 -0700 (PDT)
X-Gm-Message-State: ACrzQf0pkNG4VnPxrvg37zt3dF9sFuk8oPARS4sD7KAkaJzlYody26Uw
	UephBbuxmWzH3qVhKWMklmHBoMBVNjonGDV/2zTTbw==
X-Google-Smtp-Source: AMsMyM47gKHiYpsRCk9vLhQQSXOe9SgH1fl435XVusiakHay1BgWBWrElYj1fh0ad6iGroVncuwaH9qKuqNiCXE12sw=
X-Received: by 2002:a05:6a00:1496:b0:546:2856:6cf5 with SMTP id
 v22-20020a056a00149600b0054628566cf5mr19924366pfu.31.1664768075270; Sun, 02
 Oct 2022 20:34:35 -0700 (PDT)
List-Id: Commits to the main branch of the FreeBSD ports repository <dev-commits-ports-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main
List-Help: <mailto:dev-commits-ports-main+help@freebsd.org>
List-Post: <mailto:dev-commits-ports-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-ports-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-ports-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-ports-main@freebsd.org
X-BeenThere: dev-commits-ports-main@freebsd.org
MIME-Version: 1.0
References: <202210010705.29175Dvs065759@gitrepo.freebsd.org>
In-Reply-To: <202210010705.29175Dvs065759@gitrepo.freebsd.org>
From: Po-Chuan Hsieh <sunpoet@freebsd.org>
Date: Mon, 3 Oct 2022 11:33:58 +0800
X-Gmail-Original-Message-ID: <CAMHz58Qe+Y--aPCjdkM93W7NuJSc84AKzESqxvi3rr=07+LKkg@mail.gmail.com>
Message-ID: <CAMHz58Qe+Y--aPCjdkM93W7NuJSc84AKzESqxvi3rr=07+LKkg@mail.gmail.com>
Subject: Re: git: 17f1bb50e42a - main - shells/bash: Fix pkg-plist when NLS is
 turned off
To: Emanuel Haupt <ehaupt@freebsd.org>
Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, 
	dev-commits-ports-main@freebsd.org, Adam Weinberger <adamw@freebsd.org>
Content-Type: multipart/alternative; boundary="000000000000c2a55005ea190544"
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
	s=dkim; t=1664768076;
	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:
	 in-reply-to:in-reply-to:references:references;
	bh=b8p4B1Vrkm8lVOQvQW08Yonnm3sGmYsZJRMIqw1tVUU=;
	b=WCt1boY9lTjRrIED001xng6boX2DbIS8NvdkZg1jL1UqpxJFrYwih4ckMBBAJrZNRHipMD
	wDpBNJXv3rVMoVN4+N8j7hgXSbUqpd92rXAB0ZFuEgxBFJuSeITkrFb5rtIGi1keh/OrkZ
	0M7z14TRutjdVNwLjRTHNdG3W7kMEf22GG9+UztDWiBFIel6SqsKpYYhAYCek3qNscT809
	PgGHg9vg3qGWg0kWzoLd9L7peg6QXYPudDAPom4VkrGHrtwDNjX4+yYyAzVNJOKXZeA8qB
	g5mYm9MeFbTL6nf19tTCqHySV7SXl5KclQ6TvIQ28V6JZkNXpIFd9T6UPDzG5w==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664768076; a=rsa-sha256; cv=none;
	b=LxL0qKUUNBMmSc77YPPld5euhCiASZ6xPrVaEragVeE4mQ6hHKMGfdI+T1ZNRLBJDNFSw2
	q+gW54nmn6SDxWl9bm7O9ckxYaGtmp2uyN2XezSGZhrfa6yrRdC/KFwmy1zcKcr3F+73I+
	Tkh8ZDrbyhd/z0BK4Aefs3aTNvAW6JRAueWGHGr346CpoUNpDXpnr4LBX9VuROSIv5zTPt
	EANt8cz3oQ7ax9XmvAD07oGJxP0ZvOsoXEUTzALnRbz5CB8FmhPCmy40QuwyEgveu3T2pC
	v0p+T3Amz3LgkY5wiLmWwayRG/RvQHbTc6FCah+kRWzc5JREiEbc6s1fNvrihw==
ARC-Authentication-Results: i=1;
	mx1.freebsd.org;
	none
X-ThisMailContainsUnwantedMimeParts: N

--000000000000c2a55005ea190544
Content-Type: text/plain; charset="UTF-8"

On Sat, Oct 1, 2022 at 3:05 PM Emanuel Haupt <ehaupt@freebsd.org> wrote:

> The branch main has been updated by ehaupt:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=17f1bb50e42a45dc64fc898cd9cae905d7262bda
>
> commit 17f1bb50e42a45dc64fc898cd9cae905d7262bda
> Author:     Emanuel Haupt <ehaupt@FreeBSD.org>
> AuthorDate: 2022-10-01 07:05:08 +0000
> Commit:     Emanuel Haupt <ehaupt@FreeBSD.org>
> 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.

[1] https://people.FreeBSD.org/~sunpoet/patch/shells-bash.txt

Regards,
sunpoet


>     Notified by:    bofh (via mail)
> ---
>  shells/bash/Makefile  |   1 +
>  shells/bash/pkg-plist | 202
> +++++++++++++++++++++++++-------------------------
>  2 files changed, 102 insertions(+), 101 deletions(-)
>
> diff --git a/shells/bash/Makefile b/shells/bash/Makefile
> index 6393255c4de5..6fdb145d7cb3 100644
> --- a/shells/bash/Makefile
> +++ b/shells/bash/Makefile
> @@ -5,6 +5,7 @@ PORTNAME=               bash
>  #PATCHLEVEL=           0
>  #PORTVERSION=          5.2.${PATCHLEVEL:S/^0//g}
>  PORTVERSION=           5.2
> +PORTREVISION=          1
>  CATEGORIES=            shells
>  MASTER_SITES=          GNU
>  #DISTNAME=             ${PORTNAME}-${PORTVERSION:R}
> diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist
> index abfb12366fdf..6209a48f0fd2 100644
> --- a/shells/bash/pkg-plist
> +++ b/shells/bash/pkg-plist
> @@ -1,6 +1,8 @@
>  @shell bin/bash
>  @shell bin/rbash
>  bin/bashbug
> +man/man1/bash.1.gz
> +man/man1/bashbug.1.gz
>  %%NLS%%share/locale/af/LC_MESSAGES/bash.mo
>  %%NLS%%share/locale/bg/LC_MESSAGES/bash.mo
>  %%NLS%%share/locale/ca/LC_MESSAGES/bash.mo
> @@ -40,104 +42,102 @@ bin/bashbug
>  %%NLS%%share/locale/vi/LC_MESSAGES/bash.mo
>  %%NLS%%share/locale/zh_CN/LC_MESSAGES/bash.mo
>  %%NLS%%share/locale/zh_TW/LC_MESSAGES/bash.mo
> -%%NO_STATIC%%include/bash/alias.h
> -%%NO_STATIC%%include/bash/array.h
> -%%NO_STATIC%%include/bash/arrayfunc.h
> -%%NO_STATIC%%include/bash/assoc.h
> -%%NO_STATIC%%include/bash/bashansi.h
> -%%NO_STATIC%%include/bash/bashintl.h
> -%%NO_STATIC%%include/bash/bashjmp.h
> -%%NO_STATIC%%include/bash/bashtypes.h
> -%%NO_STATIC%%include/bash/builtins.h
> -%%NO_STATIC%%include/bash/builtins/bashgetopt.h
> -%%NO_STATIC%%include/bash/builtins/builtext.h
> -%%NO_STATIC%%include/bash/builtins/common.h
> -%%NO_STATIC%%include/bash/builtins/getopt.h
> -%%NO_STATIC%%include/bash/command.h
> -%%NO_STATIC%%include/bash/config-bot.h
> -%%NO_STATIC%%include/bash/config-top.h
> -%%NO_STATIC%%include/bash/config.h
> -%%NO_STATIC%%include/bash/conftypes.h
> -%%NO_STATIC%%include/bash/dispose_cmd.h
> -%%NO_STATIC%%include/bash/error.h
> -%%NO_STATIC%%include/bash/execute_cmd.h
> -%%NO_STATIC%%include/bash/externs.h
> -%%NO_STATIC%%include/bash/general.h
> -%%NO_STATIC%%include/bash/hashlib.h
> -%%NO_STATIC%%include/bash/include/ansi_stdlib.h
> -%%NO_STATIC%%include/bash/include/chartypes.h
> -%%NO_STATIC%%include/bash/include/filecntl.h
> -%%NO_STATIC%%include/bash/include/gettext.h
> -%%NO_STATIC%%include/bash/include/maxpath.h
> -%%NO_STATIC%%include/bash/include/memalloc.h
> -%%NO_STATIC%%include/bash/include/ocache.h
> -%%NO_STATIC%%include/bash/include/posixdir.h
> -%%NO_STATIC%%include/bash/include/posixjmp.h
> -%%NO_STATIC%%include/bash/include/posixstat.h
> -%%NO_STATIC%%include/bash/include/posixtime.h
> -%%NO_STATIC%%include/bash/include/posixwait.h
> -%%NO_STATIC%%include/bash/include/shmbchar.h
> -%%NO_STATIC%%include/bash/include/shmbutil.h
> -%%NO_STATIC%%include/bash/include/shtty.h
> -%%NO_STATIC%%include/bash/include/stat-time.h
> -%%NO_STATIC%%include/bash/include/stdc.h
> -%%NO_STATIC%%include/bash/include/systimes.h
> -%%NO_STATIC%%include/bash/include/typemax.h
> -%%NO_STATIC%%include/bash/include/unionwait.h
> -%%NO_STATIC%%include/bash/jobs.h
> -%%NO_STATIC%%include/bash/make_cmd.h
> -%%NO_STATIC%%include/bash/pathnames.h
> -%%NO_STATIC%%include/bash/quit.h
> -%%NO_STATIC%%include/bash/shell.h
> -%%NO_STATIC%%include/bash/sig.h
> -%%NO_STATIC%%include/bash/siglist.h
> -%%NO_STATIC%%include/bash/signames.h
> -%%NO_STATIC%%include/bash/subst.h
> -%%NO_STATIC%%include/bash/syntax.h
> -%%NO_STATIC%%include/bash/unwind_prot.h
> -%%NO_STATIC%%include/bash/variables.h
> -%%NO_STATIC%%include/bash/version.h
> -%%NO_STATIC%%include/bash/xmalloc.h
> -%%NO_STATIC%%include/bash/y.tab.h
> -%%NO_STATIC%%lib/bash/Makefile.inc
> -%%NO_STATIC%%lib/bash/Makefile.sample
> -%%NO_STATIC%%lib/bash/accept
> -%%NO_STATIC%%lib/bash/basename
> -%%NO_STATIC%%lib/bash/csv
> -%%NO_STATIC%%lib/bash/cut
> -%%NO_STATIC%%lib/bash/dirname
> -%%NO_STATIC%%lib/bash/dsv
> -%%NO_STATIC%%lib/bash/fdflags
> -%%NO_STATIC%%lib/bash/finfo
> -%%NO_STATIC%%lib/bash/getconf
> -%%NO_STATIC%%lib/bash/head
> -%%NO_STATIC%%lib/bash/id
> -%%NO_STATIC%%lib/bash/ln
> -%%NO_STATIC%%lib/bash/loadables.h
> -%%NO_STATIC%%lib/bash/logname
> -%%NO_STATIC%%lib/bash/mkdir
> -%%NO_STATIC%%lib/bash/mkfifo
> -%%NO_STATIC%%lib/bash/mktemp
> -%%NO_STATIC%%lib/bash/mypid
> -%%NO_STATIC%%lib/bash/pathchk
> -%%NO_STATIC%%lib/bash/print
> -%%NO_STATIC%%lib/bash/printenv
> -%%NO_STATIC%%lib/bash/push
> -%%NO_STATIC%%lib/bash/realpath
> -%%NO_STATIC%%lib/bash/rm
> -%%NO_STATIC%%lib/bash/rmdir
> -%%NO_STATIC%%lib/bash/seq
> -%%NO_STATIC%%lib/bash/setpgid
> -%%NO_STATIC%%lib/bash/sleep
> -%%NO_STATIC%%lib/bash/stat
> -%%NO_STATIC%%lib/bash/strftime
> -%%NO_STATIC%%lib/bash/sync
> -%%NO_STATIC%%lib/bash/tee
> -%%NO_STATIC%%lib/bash/truefalse
> -%%NO_STATIC%%lib/bash/tty
> -%%NO_STATIC%%lib/bash/uname
> -%%NO_STATIC%%lib/bash/unlink
> -%%NO_STATIC%%lib/bash/whoami
> -%%NO_STATIC%%libdata/pkgconfig/bash.pc
> -man/man1/bash.1.gz
> -man/man1/bashbug.1.gz
> +%%NLS%%%%NO_STATIC%%include/bash/alias.h
> +%%NLS%%%%NO_STATIC%%include/bash/array.h
> +%%NLS%%%%NO_STATIC%%include/bash/arrayfunc.h
> +%%NLS%%%%NO_STATIC%%include/bash/assoc.h
> +%%NLS%%%%NO_STATIC%%include/bash/bashansi.h
> +%%NLS%%%%NO_STATIC%%include/bash/bashintl.h
> +%%NLS%%%%NO_STATIC%%include/bash/bashjmp.h
> +%%NLS%%%%NO_STATIC%%include/bash/bashtypes.h
> +%%NLS%%%%NO_STATIC%%include/bash/builtins.h
> +%%NLS%%%%NO_STATIC%%include/bash/builtins/bashgetopt.h
> +%%NLS%%%%NO_STATIC%%include/bash/builtins/builtext.h
> +%%NLS%%%%NO_STATIC%%include/bash/builtins/common.h
> +%%NLS%%%%NO_STATIC%%include/bash/builtins/getopt.h
> +%%NLS%%%%NO_STATIC%%include/bash/command.h
> +%%NLS%%%%NO_STATIC%%include/bash/config-bot.h
> +%%NLS%%%%NO_STATIC%%include/bash/config-top.h
> +%%NLS%%%%NO_STATIC%%include/bash/config.h
> +%%NLS%%%%NO_STATIC%%include/bash/conftypes.h
> +%%NLS%%%%NO_STATIC%%include/bash/dispose_cmd.h
> +%%NLS%%%%NO_STATIC%%include/bash/error.h
> +%%NLS%%%%NO_STATIC%%include/bash/execute_cmd.h
> +%%NLS%%%%NO_STATIC%%include/bash/externs.h
> +%%NLS%%%%NO_STATIC%%include/bash/general.h
> +%%NLS%%%%NO_STATIC%%include/bash/hashlib.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/ansi_stdlib.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/chartypes.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/filecntl.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/gettext.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/maxpath.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/memalloc.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/ocache.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/posixdir.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/posixjmp.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/posixstat.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/posixtime.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/posixwait.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/shmbchar.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/shmbutil.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/shtty.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/stat-time.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/stdc.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/systimes.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/typemax.h
> +%%NLS%%%%NO_STATIC%%include/bash/include/unionwait.h
> +%%NLS%%%%NO_STATIC%%include/bash/jobs.h
> +%%NLS%%%%NO_STATIC%%include/bash/make_cmd.h
> +%%NLS%%%%NO_STATIC%%include/bash/pathnames.h
> +%%NLS%%%%NO_STATIC%%include/bash/quit.h
> +%%NLS%%%%NO_STATIC%%include/bash/shell.h
> +%%NLS%%%%NO_STATIC%%include/bash/sig.h
> +%%NLS%%%%NO_STATIC%%include/bash/siglist.h
> +%%NLS%%%%NO_STATIC%%include/bash/signames.h
> +%%NLS%%%%NO_STATIC%%include/bash/subst.h
> +%%NLS%%%%NO_STATIC%%include/bash/syntax.h
> +%%NLS%%%%NO_STATIC%%include/bash/unwind_prot.h
> +%%NLS%%%%NO_STATIC%%include/bash/variables.h
> +%%NLS%%%%NO_STATIC%%include/bash/version.h
> +%%NLS%%%%NO_STATIC%%include/bash/xmalloc.h
> +%%NLS%%%%NO_STATIC%%include/bash/y.tab.h
> +%%NLS%%%%NO_STATIC%%lib/bash/Makefile.inc
> +%%NLS%%%%NO_STATIC%%lib/bash/Makefile.sample
> +%%NLS%%%%NO_STATIC%%lib/bash/accept
> +%%NLS%%%%NO_STATIC%%lib/bash/basename
> +%%NLS%%%%NO_STATIC%%lib/bash/csv
> +%%NLS%%%%NO_STATIC%%lib/bash/cut
> +%%NLS%%%%NO_STATIC%%lib/bash/dirname
> +%%NLS%%%%NO_STATIC%%lib/bash/dsv
> +%%NLS%%%%NO_STATIC%%lib/bash/fdflags
> +%%NLS%%%%NO_STATIC%%lib/bash/finfo
> +%%NLS%%%%NO_STATIC%%lib/bash/getconf
> +%%NLS%%%%NO_STATIC%%lib/bash/head
> +%%NLS%%%%NO_STATIC%%lib/bash/id
> +%%NLS%%%%NO_STATIC%%lib/bash/ln
> +%%NLS%%%%NO_STATIC%%lib/bash/loadables.h
> +%%NLS%%%%NO_STATIC%%lib/bash/logname
> +%%NLS%%%%NO_STATIC%%lib/bash/mkdir
> +%%NLS%%%%NO_STATIC%%lib/bash/mkfifo
> +%%NLS%%%%NO_STATIC%%lib/bash/mktemp
> +%%NLS%%%%NO_STATIC%%lib/bash/mypid
> +%%NLS%%%%NO_STATIC%%lib/bash/pathchk
> +%%NLS%%%%NO_STATIC%%lib/bash/print
> +%%NLS%%%%NO_STATIC%%lib/bash/printenv
> +%%NLS%%%%NO_STATIC%%lib/bash/push
> +%%NLS%%%%NO_STATIC%%lib/bash/realpath
> +%%NLS%%%%NO_STATIC%%lib/bash/rm
> +%%NLS%%%%NO_STATIC%%lib/bash/rmdir
> +%%NLS%%%%NO_STATIC%%lib/bash/seq
> +%%NLS%%%%NO_STATIC%%lib/bash/setpgid
> +%%NLS%%%%NO_STATIC%%lib/bash/sleep
> +%%NLS%%%%NO_STATIC%%lib/bash/stat
> +%%NLS%%%%NO_STATIC%%lib/bash/strftime
> +%%NLS%%%%NO_STATIC%%lib/bash/sync
> +%%NLS%%%%NO_STATIC%%lib/bash/tee
> +%%NLS%%%%NO_STATIC%%lib/bash/truefalse
> +%%NLS%%%%NO_STATIC%%lib/bash/tty
> +%%NLS%%%%NO_STATIC%%lib/bash/uname
> +%%NLS%%%%NO_STATIC%%lib/bash/unlink
> +%%NLS%%%%NO_STATIC%%lib/bash/whoami
> +%%NLS%%%%NO_STATIC%%libdata/pkgconfig/bash.pc
>
>

--000000000000c2a55005ea190544
Content-Type: text/html; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable

<div dir=3D"ltr"><div dir=3D"ltr">On Sat, Oct 1, 2022 at 3:05 PM Emanuel Ha=
upt &lt;<a href=3D"mailto:ehaupt@freebsd.org" target=3D"_blank">ehaupt@free=
bsd.org</a>&gt; wrote:<br></div><div class=3D"gmail_quote"><blockquote clas=
s=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid r=
gb(204,204,204);padding-left:1ex">The branch main has been updated by ehaup=
t:<br>
<br>
URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D17f1bb50e42a45d=
c64fc898cd9cae905d7262bda" rel=3D"noreferrer" target=3D"_blank">https://cgi=
t.FreeBSD.org/ports/commit/?id=3D17f1bb50e42a45dc64fc898cd9cae905d7262bda</=
a><br>
<br>
commit 17f1bb50e42a45dc64fc898cd9cae905d7262bda<br>
Author:=C2=A0 =C2=A0 =C2=A0Emanuel Haupt &lt;ehaupt@FreeBSD.org&gt;<br>
AuthorDate: 2022-10-01 07:05:08 +0000<br>
Commit:=C2=A0 =C2=A0 =C2=A0Emanuel Haupt &lt;ehaupt@FreeBSD.org&gt;<br>
CommitDate: 2022-10-01 07:05:08 +0000<br>
<br>
=C2=A0 =C2=A0 shells/bash: Fix pkg-plist when NLS is turned off<br></blockq=
uote><div><br></div><div>Hello,</div><div><br></div><div>I thought the NLS =
issue was already fixed in cc83ec0f744fb159bd48303d15c09aa0c6cb38a4 by Adam=
. Could you please check again?</div><div><br></div><div>Furthermore,=C2=A0=
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/b=
ash/. I&#39;ve prepared a patch [1] to revert the PLIST change and also fix=
 the PLIST order (incorrectly changed in=C2=A034393efcc244fe0d4e76a8e12ae34=
3decdf0b083). Please take a look. Thanks.</div><div><br></div><div>[1]=C2=
=A0<a href=3D"https://people.FreeBSD.org/~sunpoet/patch/shells-bash.txt" ta=
rget=3D"_blank">https://people.FreeBSD.org/~sunpoet/patch/shells-bash.txt</=
a></div><div><br></div><div>Regards,</div><div>sunpoet</div><div><br></div>=
<blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-=
left:1px solid rgb(204,204,204);padding-left:1ex">
<br>
=C2=A0 =C2=A0 Notified by:=C2=A0 =C2=A0 bofh (via mail)<br>
---<br>
=C2=A0shells/bash/Makefile=C2=A0 |=C2=A0 =C2=A01 +<br>
=C2=A0shells/bash/pkg-plist | 202 +++++++++++++++++++++++++----------------=
---------<br>
=C2=A02 files changed, 102 insertions(+), 101 deletions(-)<br>
<br>
diff --git a/shells/bash/Makefile b/shells/bash/Makefile<br>
index 6393255c4de5..6fdb145d7cb3 100644<br>
--- a/shells/bash/Makefile<br>
+++ b/shells/bash/Makefile<br>
@@ -5,6 +5,7 @@ PORTNAME=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0=
 =C2=A0bash<br>
=C2=A0#PATCHLEVEL=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00<br>
=C2=A0#PORTVERSION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 5.2.${PATCHLEVEL:S/=
^0//g}<br>
=C2=A0PORTVERSION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A05.2<br>
+PORTREVISION=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 1<br>
=C2=A0CATEGORIES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 shells<br>
=C2=A0MASTER_SITES=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 GNU<br>
=C2=A0#DISTNAME=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${PORTNAM=
E}-${PORTVERSION:R}<br>
diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist<br>
index abfb12366fdf..6209a48f0fd2 100644<br>
--- a/shells/bash/pkg-plist<br>
+++ b/shells/bash/pkg-plist<br>
@@ -1,6 +1,8 @@<br>
=C2=A0@shell bin/bash<br>
=C2=A0@shell bin/rbash<br>
=C2=A0bin/bashbug<br>
+man/man1/bash.1.gz<br>
+man/man1/bashbug.1.gz<br>
=C2=A0%%NLS%%share/locale/af/LC_MESSAGES/bash.mo<br>
=C2=A0%%NLS%%share/locale/bg/LC_MESSAGES/bash.mo<br>
=C2=A0%%NLS%%share/locale/ca/LC_MESSAGES/bash.mo<br>
@@ -40,104 +42,102 @@ bin/bashbug<br>
=C2=A0%%NLS%%share/locale/vi/LC_MESSAGES/bash.mo<br>
=C2=A0%%NLS%%share/locale/zh_CN/LC_MESSAGES/bash.mo<br>
=C2=A0%%NLS%%share/locale/zh_TW/LC_MESSAGES/bash.mo<br>
-%%NO_STATIC%%include/bash/alias.h<br>
-%%NO_STATIC%%include/bash/array.h<br>
-%%NO_STATIC%%include/bash/arrayfunc.h<br>
-%%NO_STATIC%%include/bash/assoc.h<br>
-%%NO_STATIC%%include/bash/bashansi.h<br>
-%%NO_STATIC%%include/bash/bashintl.h<br>
-%%NO_STATIC%%include/bash/bashjmp.h<br>
-%%NO_STATIC%%include/bash/bashtypes.h<br>
-%%NO_STATIC%%include/bash/builtins.h<br>
-%%NO_STATIC%%include/bash/builtins/bashgetopt.h<br>
-%%NO_STATIC%%include/bash/builtins/builtext.h<br>
-%%NO_STATIC%%include/bash/builtins/common.h<br>
-%%NO_STATIC%%include/bash/builtins/getopt.h<br>
-%%NO_STATIC%%include/bash/command.h<br>
-%%NO_STATIC%%include/bash/config-bot.h<br>
-%%NO_STATIC%%include/bash/config-top.h<br>
-%%NO_STATIC%%include/bash/config.h<br>
-%%NO_STATIC%%include/bash/conftypes.h<br>
-%%NO_STATIC%%include/bash/dispose_cmd.h<br>
-%%NO_STATIC%%include/bash/error.h<br>
-%%NO_STATIC%%include/bash/execute_cmd.h<br>
-%%NO_STATIC%%include/bash/externs.h<br>
-%%NO_STATIC%%include/bash/general.h<br>
-%%NO_STATIC%%include/bash/hashlib.h<br>
-%%NO_STATIC%%include/bash/include/ansi_stdlib.h<br>
-%%NO_STATIC%%include/bash/include/chartypes.h<br>
-%%NO_STATIC%%include/bash/include/filecntl.h<br>
-%%NO_STATIC%%include/bash/include/gettext.h<br>
-%%NO_STATIC%%include/bash/include/maxpath.h<br>
-%%NO_STATIC%%include/bash/include/memalloc.h<br>
-%%NO_STATIC%%include/bash/include/ocache.h<br>
-%%NO_STATIC%%include/bash/include/posixdir.h<br>
-%%NO_STATIC%%include/bash/include/posixjmp.h<br>
-%%NO_STATIC%%include/bash/include/posixstat.h<br>
-%%NO_STATIC%%include/bash/include/posixtime.h<br>
-%%NO_STATIC%%include/bash/include/posixwait.h<br>
-%%NO_STATIC%%include/bash/include/shmbchar.h<br>
-%%NO_STATIC%%include/bash/include/shmbutil.h<br>
-%%NO_STATIC%%include/bash/include/shtty.h<br>
-%%NO_STATIC%%include/bash/include/stat-time.h<br>
-%%NO_STATIC%%include/bash/include/stdc.h<br>
-%%NO_STATIC%%include/bash/include/systimes.h<br>
-%%NO_STATIC%%include/bash/include/typemax.h<br>
-%%NO_STATIC%%include/bash/include/unionwait.h<br>
-%%NO_STATIC%%include/bash/jobs.h<br>
-%%NO_STATIC%%include/bash/make_cmd.h<br>
-%%NO_STATIC%%include/bash/pathnames.h<br>
-%%NO_STATIC%%include/bash/quit.h<br>
-%%NO_STATIC%%include/bash/shell.h<br>
-%%NO_STATIC%%include/bash/sig.h<br>
-%%NO_STATIC%%include/bash/siglist.h<br>
-%%NO_STATIC%%include/bash/signames.h<br>
-%%NO_STATIC%%include/bash/subst.h<br>
-%%NO_STATIC%%include/bash/syntax.h<br>
-%%NO_STATIC%%include/bash/unwind_prot.h<br>
-%%NO_STATIC%%include/bash/variables.h<br>
-%%NO_STATIC%%include/bash/version.h<br>
-%%NO_STATIC%%include/bash/xmalloc.h<br>
-%%NO_STATIC%%include/bash/y.tab.h<br>
-%%NO_STATIC%%lib/bash/Makefile.inc<br>
-%%NO_STATIC%%lib/bash/Makefile.sample<br>
-%%NO_STATIC%%lib/bash/accept<br>
-%%NO_STATIC%%lib/bash/basename<br>
-%%NO_STATIC%%lib/bash/csv<br>
-%%NO_STATIC%%lib/bash/cut<br>
-%%NO_STATIC%%lib/bash/dirname<br>
-%%NO_STATIC%%lib/bash/dsv<br>
-%%NO_STATIC%%lib/bash/fdflags<br>
-%%NO_STATIC%%lib/bash/finfo<br>
-%%NO_STATIC%%lib/bash/getconf<br>
-%%NO_STATIC%%lib/bash/head<br>
-%%NO_STATIC%%lib/bash/id<br>
-%%NO_STATIC%%lib/bash/ln<br>
-%%NO_STATIC%%lib/bash/loadables.h<br>
-%%NO_STATIC%%lib/bash/logname<br>
-%%NO_STATIC%%lib/bash/mkdir<br>
-%%NO_STATIC%%lib/bash/mkfifo<br>
-%%NO_STATIC%%lib/bash/mktemp<br>
-%%NO_STATIC%%lib/bash/mypid<br>
-%%NO_STATIC%%lib/bash/pathchk<br>
-%%NO_STATIC%%lib/bash/print<br>
-%%NO_STATIC%%lib/bash/printenv<br>
-%%NO_STATIC%%lib/bash/push<br>
-%%NO_STATIC%%lib/bash/realpath<br>
-%%NO_STATIC%%lib/bash/rm<br>
-%%NO_STATIC%%lib/bash/rmdir<br>
-%%NO_STATIC%%lib/bash/seq<br>
-%%NO_STATIC%%lib/bash/setpgid<br>
-%%NO_STATIC%%lib/bash/sleep<br>
-%%NO_STATIC%%lib/bash/stat<br>
-%%NO_STATIC%%lib/bash/strftime<br>
-%%NO_STATIC%%lib/bash/sync<br>
-%%NO_STATIC%%lib/bash/tee<br>
-%%NO_STATIC%%lib/bash/truefalse<br>
-%%NO_STATIC%%lib/bash/tty<br>
-%%NO_STATIC%%lib/bash/uname<br>
-%%NO_STATIC%%lib/bash/unlink<br>
-%%NO_STATIC%%lib/bash/whoami<br>
-%%NO_STATIC%%libdata/pkgconfig/bash.pc<br>
-man/man1/bash.1.gz<br>
-man/man1/bashbug.1.gz<br>
+%%NLS%%%%NO_STATIC%%include/bash/alias.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/array.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/arrayfunc.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/assoc.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/bashansi.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/bashintl.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/bashjmp.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/bashtypes.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/builtins.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/builtins/bashgetopt.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/builtins/builtext.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/builtins/common.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/builtins/getopt.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/command.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/config-bot.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/config-top.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/config.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/conftypes.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/dispose_cmd.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/error.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/execute_cmd.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/externs.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/general.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/hashlib.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/ansi_stdlib.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/chartypes.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/filecntl.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/gettext.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/maxpath.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/memalloc.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/ocache.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/posixdir.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/posixjmp.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/posixstat.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/posixtime.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/posixwait.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/shmbchar.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/shmbutil.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/shtty.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/stat-time.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/stdc.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/systimes.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/typemax.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/include/unionwait.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/jobs.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/make_cmd.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/pathnames.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/quit.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/shell.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/sig.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/siglist.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/signames.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/subst.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/syntax.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/unwind_prot.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/variables.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/version.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/xmalloc.h<br>
+%%NLS%%%%NO_STATIC%%include/bash/y.tab.h<br>
+%%NLS%%%%NO_STATIC%%lib/bash/Makefile.inc<br>
+%%NLS%%%%NO_STATIC%%lib/bash/Makefile.sample<br>
+%%NLS%%%%NO_STATIC%%lib/bash/accept<br>
+%%NLS%%%%NO_STATIC%%lib/bash/basename<br>
+%%NLS%%%%NO_STATIC%%lib/bash/csv<br>
+%%NLS%%%%NO_STATIC%%lib/bash/cut<br>
+%%NLS%%%%NO_STATIC%%lib/bash/dirname<br>
+%%NLS%%%%NO_STATIC%%lib/bash/dsv<br>
+%%NLS%%%%NO_STATIC%%lib/bash/fdflags<br>
+%%NLS%%%%NO_STATIC%%lib/bash/finfo<br>
+%%NLS%%%%NO_STATIC%%lib/bash/getconf<br>
+%%NLS%%%%NO_STATIC%%lib/bash/head<br>
+%%NLS%%%%NO_STATIC%%lib/bash/id<br>
+%%NLS%%%%NO_STATIC%%lib/bash/ln<br>
+%%NLS%%%%NO_STATIC%%lib/bash/loadables.h<br>
+%%NLS%%%%NO_STATIC%%lib/bash/logname<br>
+%%NLS%%%%NO_STATIC%%lib/bash/mkdir<br>
+%%NLS%%%%NO_STATIC%%lib/bash/mkfifo<br>
+%%NLS%%%%NO_STATIC%%lib/bash/mktemp<br>
+%%NLS%%%%NO_STATIC%%lib/bash/mypid<br>
+%%NLS%%%%NO_STATIC%%lib/bash/pathchk<br>
+%%NLS%%%%NO_STATIC%%lib/bash/print<br>
+%%NLS%%%%NO_STATIC%%lib/bash/printenv<br>
+%%NLS%%%%NO_STATIC%%lib/bash/push<br>
+%%NLS%%%%NO_STATIC%%lib/bash/realpath<br>
+%%NLS%%%%NO_STATIC%%lib/bash/rm<br>
+%%NLS%%%%NO_STATIC%%lib/bash/rmdir<br>
+%%NLS%%%%NO_STATIC%%lib/bash/seq<br>
+%%NLS%%%%NO_STATIC%%lib/bash/setpgid<br>
+%%NLS%%%%NO_STATIC%%lib/bash/sleep<br>
+%%NLS%%%%NO_STATIC%%lib/bash/stat<br>
+%%NLS%%%%NO_STATIC%%lib/bash/strftime<br>
+%%NLS%%%%NO_STATIC%%lib/bash/sync<br>
+%%NLS%%%%NO_STATIC%%lib/bash/tee<br>
+%%NLS%%%%NO_STATIC%%lib/bash/truefalse<br>
+%%NLS%%%%NO_STATIC%%lib/bash/tty<br>
+%%NLS%%%%NO_STATIC%%lib/bash/uname<br>
+%%NLS%%%%NO_STATIC%%lib/bash/unlink<br>
+%%NLS%%%%NO_STATIC%%lib/bash/whoami<br>
+%%NLS%%%%NO_STATIC%%libdata/pkgconfig/bash.pc<br>
<br>
</blockquote></div></div>

--000000000000c2a55005ea190544--