From owner-dev-commits-ports-all@freebsd.org Tue May 11 21:54:07 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 76903647000; Tue, 11 May 2021 21:54:07 +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 4FfsBk66rwz4rtV; Tue, 11 May 2021 21:54:06 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 7AD261F964; Tue, 11 May 2021 21:54:06 +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 14BLs6vU001176; Tue, 11 May 2021 21:54:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 14BLs6q3001175; Tue, 11 May 2021 21:54:06 GMT (envelope-from git) Date: Tue, 11 May 2021 21:54:06 GMT Message-Id: <202105112154.14BLs6q3001175@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Po-Chuan Hsieh Subject: git: ac770530c4fd - main - devel/readline: Update documentation for inputrc path MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sunpoet X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ac770530c4fd75bdff85e961d2bf0be5d112a843 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 11 May 2021 21:54:07 -0000 The branch main has been updated by sunpoet: URL: https://cgit.FreeBSD.org/ports/commit/?id=ac770530c4fd75bdff85e961d2bf0be5d112a843 commit ac770530c4fd75bdff85e961d2bf0be5d112a843 Author: Po-Chuan Hsieh AuthorDate: 2021-05-11 21:37:41 +0000 Commit: Po-Chuan Hsieh 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 --- 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