From nobody Mon Oct 03 06:07: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 4Mgr3c0nmRz4VBcQ; Mon, 3 Oct 2022 06:07:56 +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 4Mgr3c0LV3z3RNq; Mon, 3 Oct 2022 06:07:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664777276; 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=AKY4a8CtlxxxMp5bHNcplJhFTY9qSD51pF9boSeLKrY=; b=d4Emvq1BVUCiKg2xTkRdODB9X1jlDo+lvBIuXukPiPMbFHWMmhCsDaGf7VCxoI/ZO+bjQZ gMONHhygxseIbjUvryF/8WVVNd4HCL0l+TgFD4YBgwdeBZxplBv7HSGf9p3/BsUfHdNfW5 FP7ItD5lTyZmoQQrPysTgUSvb99C2dUnsPXwL97tRemcs6QsRtrTy/d0KQs2yvRJ3vMHxi 8H0S1nWn0oko+0Lb5TG6hKWmsxDf0Uku3dZV9fNIjr0qtOnkQCQ/S55Md0+xtz1ULtzDLk B4qp0uTP6Z8n2ndf8TFDFbVBRpGCA/cnaCx29m08S5IH7VVV5F6sIa6t+0WhaQ== 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 4Mgr3b64jRz16Rs; Mon, 3 Oct 2022 06:07:55 +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 29367tuc077864; Mon, 3 Oct 2022 06:07:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29367tG8077863; Mon, 3 Oct 2022 06:07:55 GMT (envelope-from git) Date: Mon, 3 Oct 2022 06:07:55 GMT Message-Id: <202210030607.29367tG8077863@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Emanuel Haupt Subject: git: 7fea2bffc615 - main - shells/bash: Revise fix when NLS is off 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: ehaupt X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7fea2bffc61514432cb0da504cef54f2fe8fe771 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1664777276; 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=AKY4a8CtlxxxMp5bHNcplJhFTY9qSD51pF9boSeLKrY=; b=xCRtoY4j/FFJWmQ8nNCVuYvVTQFzg1oixE6KnOJR51Z81Il7Btd7+40rdXBbmiOxoSJqEe tzmIpew6PFanrpM33qhGXyVsspX/TJf89kkUhvYrcXDRyhQvBXKIZokVZ5xYBQTDNUAqw6 OTL0o/103SXQyBRHm7KgzbCaMj7POqr7I3CHgcEAsw15FiS397Ajh2SEf3h86ewlaavk6F 4USltvFgO5y6xqUidiKKJf+0lzaKpytLAPbsnlW+4CZBJ9ExburiLrhxiIdYVqRaROkZ4Z 2Tl7SSptp7oJf6bOspwucJUgItjrKuawSGt6UsmeJrxYvggoq59RlnV9PBxpDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1664777276; a=rsa-sha256; cv=none; b=daqC61R2tEWgvUPJicDG1ToMjtil/qQ4LstRQHblH84aXVpIAJ+6t9tsj9FlGnAVS+7Hoz kPbHK9A92C3KDWZkSS4LBYr7sb4+Q381eHkpAXxkl+bHmpN/9rQSBrL8y9da6nLyr2kMyE zqw4/v9lulvLRVpGwOvv3LGPenAs7eQ2IqZcA3irCJiqcq+W5jEi6s+OxMl2HZkv+jCH8e 66xQeRqm635tzDz7XDcUtMlQKURWHh+SMZWVmGiRSvheututsWj5bBfAaGrBOlAMJt/LND pzL5fD4bjom6djHhzyT0NNfeZCzmbp8dVXuWBYcn3+OkEvl8q70n6bGf0K7uhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by ehaupt: URL: https://cgit.FreeBSD.org/ports/commit/?id=7fea2bffc61514432cb0da504cef54f2fe8fe771 commit 7fea2bffc61514432cb0da504cef54f2fe8fe771 Author: Po-Chuan Hsieh AuthorDate: 2022-10-03 06:03:44 +0000 Commit: Emanuel Haupt CommitDate: 2022-10-03 06:03:44 +0000 shells/bash: Revise fix when NLS is off The fix commited in 17f1bb50e42a45dc64fc898cd9cae905d7262bda clashed with cc83ec0f744fb159bd48303d15c09aa0c6cb38a4. The later is a more elegant solution that doesn't require to drop the header files from being installed. This commit reverts changes from 17f1bb50e42a45dc64fc898cd9cae905d7262bda. --- shells/bash/Makefile | 2 +- shells/bash/pkg-plist | 200 +++++++++++++++++++++++++------------------------- 2 files changed, 101 insertions(+), 101 deletions(-) diff --git a/shells/bash/Makefile b/shells/bash/Makefile index 59e37945f965..fcf0d36ef938 100644 --- a/shells/bash/Makefile +++ b/shells/bash/Makefile @@ -5,7 +5,7 @@ PORTNAME= bash #PATCHLEVEL= 0 #PORTVERSION= 5.2.${PATCHLEVEL:S/^0//g} PORTVERSION= 5.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= shells MASTER_SITES= GNU #DISTNAME= ${PORTNAME}-${PORTVERSION:R} diff --git a/shells/bash/pkg-plist b/shells/bash/pkg-plist index 6209a48f0fd2..35ea19a1fdbb 100644 --- a/shells/bash/pkg-plist +++ b/shells/bash/pkg-plist @@ -1,6 +1,105 @@ @shell bin/bash -@shell bin/rbash bin/bashbug +@shell bin/rbash +%%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%%share/locale/af/LC_MESSAGES/bash.mo @@ -42,102 +141,3 @@ man/man1/bashbug.1.gz %%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 -%%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