Attachment 224165 Details for Bug 255126 – Please apply using 'git am'

[patch] Please apply using 'git am'

0001-shells-bash-Prefix-etc-inputrc-in-bundled-readline-a.patch (text/plain), 1.92 KB, created by Olivier Certner on 2021-04-16 14:49:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Olivier Certner

Created: 2021-04-16 14:49:12 UTC

Size: 1.92 KB

patch

obsolete

>From 7bbe92c01eabd50bfdd9e3e5a0da4528d3dd78e5 Mon Sep 17 00:00:00 2001
>From: Olivier Certner <olce.freebsd@certner.fr>
>Date: Fri, 16 Apr 2021 16:18:53 +0200
>Subject: [PATCH] shells/bash: Prefix '/etc/inputrc' in bundled readline and
> doc
>
>Packagers using the default PORTS_READLINE=on already enjoy the change, since
>it was committed to devel/readline on 20210103.
>
>PR:	255126
>---
> UPDATING             | 8 ++++++++
> shells/bash/Makefile | 5 ++++-
> 2 files changed, 12 insertions(+), 1 deletion(-)
>
>diff --git a/UPDATING b/UPDATING
>index a4bd84505977..547011970462 100644
>--- a/UPDATING
>+++ b/UPDATING
>@@ -5,6 +5,14 @@ they are unavoidable.
> You should get into the habit of checking this file for changes each time
> you update your ports collection, before attempting any port upgrades.
> 
>+20210416:
>+  AFFECTS: Users of shells/bash, shells/bash-static with PORTS_READLINE=off
>+  AUTHOR: olce.freebsd@certner.fr
>+
>+  Bundled readline now will use LOCALBASE/etc/inputrc as its ultimate default
>+  inputrc file (instead of /etc/inputrc). This puts these ports in line with
>+  what devel/readline has been doing recently (since 20210103).
>+
> 20210414:
>   AFFECTS: users of graphics/OpenEXR or graphics/ilmbase
>   AUTHOR: mandree@FreeBSD.org
>diff --git a/shells/bash/Makefile b/shells/bash/Makefile
>index af7c1b74a60f..a56d6db9c752 100644
>--- a/shells/bash/Makefile
>+++ b/shells/bash/Makefile
>@@ -3,7 +3,7 @@
> PORTNAME=		bash
> PATCHLEVEL=		4
> PORTVERSION=		5.1.${PATCHLEVEL:S/^0//g}
>-PORTREVISION?=		1
>+PORTREVISION?=		2
> CATEGORIES=		shells
> MASTER_SITES=		GNU
> DISTNAME=		${PORTNAME}-${PORTVERSION:R}
>@@ -93,6 +93,9 @@ post-patch:
> .endif
> 	@${REINPLACE_CMD} -e "s|$/etc/profile$|${LOCALBASE}\1|" \
> 		${WRKSRC}/pathnames.h.in
>+	@${REINPLACE_CMD} -e "s|/etc/[iI]nputrc|${LOCALBASE}/etc/inputrc|g" \
>+		${WRKSRC}/doc/*.info ${WRKSRC}/doc/*.html ${WRKSRC}/doc/*.1 \
>+		${WRKSRC}/lib/readline/rlconf.h
> 
> post-patch-SYSBASHRC-on:
> 	@${REINPLACE_CMD} \
>-- 
>2.30.0
>

Actions: View | Diff

Attachments on bug 255126: 224165