aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmanuel Haupt <ehaupt@FreeBSD.org>2021-04-16 18:01:43 +0000
committerEmanuel Haupt <ehaupt@FreeBSD.org>2021-04-16 18:07:43 +0000
commita0fcd3d7075010c6f0e41309a680f2611fa95249 (patch)
treeea168e80a961772d799e610ecda210445557be75
parent2e4045a9f05fb2139f1203abfbeab9c2cae638a4 (diff)
downloadports-a0fcd3d7075010c6f0e41309a680f2611fa95249.tar.gz
ports-a0fcd3d7075010c6f0e41309a680f2611fa95249.zip
shells/bash:Prefix '/etc/inputrc' in bundled readline and documentation
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). PR: 255126 Submitted by: olivier.freebsd@free.fr
-rw-r--r--UPDATING8
-rw-r--r--shells/bash/Makefile5
2 files changed, 12 insertions, 1 deletions
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} \