git: ac770530c4fd - main - devel/readline: Update documentation for inputrc path

Po-Chuan Hsieh sunpoet at FreeBSD.org
Tue May 11 21:54:07 UTC 2021


The branch main has been updated by sunpoet:

URL: https://cgit.FreeBSD.org/ports/commit/?id=ac770530c4fd75bdff85e961d2bf0be5d112a843

commit ac770530c4fd75bdff85e961d2bf0be5d112a843
Author:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
AuthorDate: 2021-05-11 21:37:41 +0000
Commit:     Po-Chuan Hsieh <sunpoet at FreeBSD.org>
CommitDate: 2021-05-11 21:47:33 +0000

    devel/readline: Update documentation for inputrc path
    
    - It is a followup of r560241 (2e6fe3dbbc03c4fa3dc2593c3b24b61d67626b83) and r560398 (cdbdbb820fc870041f7d8e8a4a61d4e625338ee6)
    
    PR:             255125
    Reported by:    Olivier Certner <olivier.freebsd at free.fr>
---
 devel/readline/Makefile                       |  3 ++-
 devel/readline/files/patch-doc-readline.3     | 25 +++++++++++++++++++++++++
 devel/readline/files/patch-doc-readline.info  | 22 ++++++++++++++++++++++
 devel/readline/files/patch-doc-rluserman.info | 22 ++++++++++++++++++++++
 4 files changed, 71 insertions(+), 1 deletion(-)

diff --git a/devel/readline/Makefile b/devel/readline/Makefile
index 709d35a01232..4c57cef1a87f 100644
--- a/devel/readline/Makefile
+++ b/devel/readline/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	readline
 PORTVERSION=	8.1.${PATCHLEVEL}
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	GNU
 DISTNAME=	${PORTNAME}-${PORTVERSION:R}
@@ -41,7 +42,7 @@ PATCHLEVEL=	0
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/rlconf.h
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/rlconf.h ${WRKSRC}/doc/readline.3 ${WRKSRC}/doc/readline.info ${WRKSRC}/doc/rluserman.info
 .if exists(/usr/lib/libtermcapw.so)
 	@${REINPLACE_CMD} 's|-ltermcap|-ltermcapw|g' ${WRKSRC}/configure
 .endif
diff --git a/devel/readline/files/patch-doc-readline.3 b/devel/readline/files/patch-doc-readline.3
new file mode 100644
index 000000000000..d7d7b3631b32
--- /dev/null
+++ b/devel/readline/files/patch-doc-readline.3
@@ -0,0 +1,25 @@
+--- doc/readline.3.orig	2020-10-29 20:48:10 UTC
++++ doc/readline.3
+@@ -118,7 +118,7 @@ The name of this file is taken from the value of the
+ environment variable.  If that variable is unset, the default is
+ .IR ~/.inputrc .
+ If that file  does not exist or cannot be read, the ultimate default is
+-.IR /etc/inputrc .
++.IR %%PREFIX%%/etc/inputrc .
+ When a program which uses the readline library starts up, the
+ init file is read, and the key bindings and variables are set.
+ There are only a few basic constructs allowed in the
+@@ -722,11 +722,11 @@ the test fails.
+ .IP \fB$include\fP
+ This directive takes a single filename as an argument and reads commands
+ and bindings from that file.  For example, the following directive
+-would read \fI/etc/inputrc\fP:
++would read \fI%%PREFIX%%/etc/inputrc\fP:
+ .sp 1
+ .RS
+ .nf
+-\fB$include\fP \^ \fI/etc/inputrc\fP
++\fB$include\fP \^ \fI%%PREFIX%%/etc/inputrc\fP
+ .fi 
+ .RE
+ .SH SEARCHING
diff --git a/devel/readline/files/patch-doc-readline.info b/devel/readline/files/patch-doc-readline.info
new file mode 100644
index 000000000000..6eb3350f6d4d
--- /dev/null
+++ b/devel/readline/files/patch-doc-readline.info
@@ -0,0 +1,22 @@
+--- doc/readline.info.orig	2020-10-30 14:07:51 UTC
++++ doc/readline.info
+@@ -313,7 +313,7 @@ putting commands in an "inputrc" file, conventionally 
+ directory.  The name of this file is taken from the value of the
+ environment variable 'INPUTRC'.  If that variable is unset, the default
+ is '~/.inputrc'.  If that file does not exist or cannot be read, the
+-ultimate default is '/etc/inputrc'.
++ultimate default is '%%PREFIX%%/etc/inputrc'.
+ 
+    When a program which uses the Readline library starts up, the init
+ file is read, and the key bindings are set.
+@@ -853,8 +853,8 @@ four parser directives used.
+ '$include'
+      This directive takes a single filename as an argument and reads
+      commands and bindings from that file.  For example, the following
+-     directive reads from '/etc/inputrc':
+-          $include /etc/inputrc
++     directive reads from '%%PREFIX%%/etc/inputrc':
++          $include %%PREFIX%%/etc/inputrc
+ 
+ 
+ File: readline.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File
diff --git a/devel/readline/files/patch-doc-rluserman.info b/devel/readline/files/patch-doc-rluserman.info
new file mode 100644
index 000000000000..332ba1fc1715
--- /dev/null
+++ b/devel/readline/files/patch-doc-rluserman.info
@@ -0,0 +1,22 @@
+--- doc/rluserman.info.orig	2020-10-30 14:07:52 UTC
++++ doc/rluserman.info
+@@ -311,7 +311,7 @@ putting commands in an "inputrc" file, conventionally 
+ directory.  The name of this file is taken from the value of the
+ environment variable 'INPUTRC'.  If that variable is unset, the default
+ is '~/.inputrc'.  If that file does not exist or cannot be read, the
+-ultimate default is '/etc/inputrc'.
++ultimate default is '%%PREFIX%%/etc/inputrc'.
+ 
+    When a program which uses the Readline library starts up, the init
+ file is read, and the key bindings are set.
+@@ -851,8 +851,8 @@ four parser directives used.
+ '$include'
+      This directive takes a single filename as an argument and reads
+      commands and bindings from that file.  For example, the following
+-     directive reads from '/etc/inputrc':
+-          $include /etc/inputrc
++     directive reads from '%%PREFIX%%/etc/inputrc':
++          $include %%PREFIX%%/etc/inputrc
+ 
+ 
+ File: rluserman.info,  Node: Sample Init File,  Prev: Conditional Init Constructs,  Up: Readline Init File


More information about the dev-commits-ports-all mailing list