From owner-svn-ports-head@freebsd.org Mon Jan 4 16:22:32 2021 Return-Path: Delivered-To: svn-ports-head@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 0F0AF4DB38F; Mon, 4 Jan 2021 16:22:32 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from mouf.net (mouf.net [IPv6:2607:fc50:0:4400:216:3eff:fe69:33b3]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "mouf.net", Issuer "mouf.net" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4D8grl6xcRz3FV9; Mon, 4 Jan 2021 16:22:31 +0000 (UTC) (envelope-from swills@FreeBSD.org) Received: from lrrr.mouf.net (cpe-76-182-16-135.nc.res.rr.com [76.182.16.135]) (authenticated bits=0) by mouf.net (8.14.9/8.14.9) with ESMTP id 104GMNBS036666 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NOT); Mon, 4 Jan 2021 16:22:29 GMT (envelope-from swills@FreeBSD.org) Subject: Re: svn commit: r560241 - head/devel/readline To: Po-Chuan Hsieh Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org References: <202101032029.103KTsw0028112@repo.freebsd.org> <5d52f437-618a-0da2-c8eb-a403a7e401fc@FreeBSD.org> From: Steve Wills Message-ID: <8ffc93fb-5efb-d40b-edf0-591ca3cf2676@FreeBSD.org> Date: Mon, 4 Jan 2021 11:22:18 -0500 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:78.0) Gecko/20100101 Thunderbird/78.6.0 MIME-Version: 1.0 In-Reply-To: Content-Type: multipart/mixed; boundary="------------1DA202B8FBEA18E250789E72" Content-Language: en-US X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.4.3 (mouf.net [199.48.129.64]); Mon, 04 Jan 2021 16:22:29 +0000 (UTC) X-Spam-Status: No, score=-0.7 required=4.5 tests=KHOP_HELO_FCRDNS, NICE_REPLY_A autolearn=unavailable autolearn_force=no version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mouf.net X-Virus-Scanned: clamav-milter 0.99.2 at mouf.net X-Virus-Status: Clean X-Rspamd-Queue-Id: 4D8grl6xcRz3FV9 X-Spamd-Bar: ---- Authentication-Results: mx1.freebsd.org; none X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[] X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 Jan 2021 16:22:32 -0000 This is a multi-part message in MIME format. --------------1DA202B8FBEA18E250789E72 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit Hi, On 1/4/21 10:36 AM, Po-Chuan Hsieh wrote: > > > I also considered PREFIX while preparing the patch. On second thought, I > think LOCALBASE is the right answer since inputrc is not part of the > readline package. I disagree, the inputrc file is a file that could very well be part of the readline package if it installed a sample, see attached. It's a readline file, not something installed some other package. It may be installed or edit by the admin user, but that applies to all config files. LOCALBASE is "files installed by other packages". So, PREFIX is correct and LOCALBASE is not. Cheers, Steve --------------1DA202B8FBEA18E250789E72 Content-Type: text/x-patch; charset=UTF-8; name="readline_reinplace-rev1.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="readline_reinplace-rev1.diff" diff --git devel/readline/Makefile devel/readline/Makefile index 34820ecedc0d..6f52b7f804af 100644 --- devel/readline/Makefile +++ devel/readline/Makefile @@ -37,13 +37,16 @@ PATCHLEVEL= ${PATCHES:O:[-1]} PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|} .endfor +ETCDIR= ${PREFIX}/etc + post-patch: - @${REINPLACE_CMD} -e '/SYS_INPUTRC/ s|/etc/inputrc|${LOCALBASE}&|' ${WRKSRC}/rlconf.h + @${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/rlconf.h .if exists(/usr/lib/libtermcapw.so) @${REINPLACE_CMD} 's|-ltermcap|-ltermcapw|g' ${WRKSRC}/configure .endif post-install: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libhistory.so.8.0 ${STAGEDIR}${PREFIX}/lib/libreadline.so.8.0 + ${INSTALL_DATA} ${WRKSRC}/examples/Inputrc ${STAGEDIR}${ETCDIR}/inputrc.sample .include diff --git devel/readline/files/patch-rlconf.h devel/readline/files/patch-rlconf.h new file mode 100644 index 000000000000..2fc7de2dff9d --- /dev/null +++ devel/readline/files/patch-rlconf.h @@ -0,0 +1,11 @@ +--- rlconf.h.orig 2021-01-04 15:13:43 UTC ++++ rlconf.h +@@ -43,7 +43,7 @@ + #define DEFAULT_INPUTRC "~/.inputrc" + + /* The ultimate last-ditch filename for an init file -- system-wide. */ +-#define SYS_INPUTRC "/etc/inputrc" ++#define SYS_INPUTRC "%%PREFIX%%/etc/inputrc" + + /* If defined, expand tabs to spaces. */ + #define DISPLAY_TABS diff --git devel/readline/pkg-plist devel/readline/pkg-plist index 3b1cec75b888..6fbd001c29d9 100644 --- devel/readline/pkg-plist +++ devel/readline/pkg-plist @@ -1,3 +1,4 @@ +@sample %%ETCDIR%%/inputrc.sample include/readline/chardefs.h include/readline/history.h include/readline/keymaps.h --------------1DA202B8FBEA18E250789E72--