Date: Mon, 4 Jan 2021 10:22:10 -0500 From: Steve Wills <swills@FreeBSD.org> To: Sunpoet Po-Chuan Hsieh <sunpoet@FreeBSD.org>, ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r560241 - head/devel/readline Message-ID: <5d52f437-618a-0da2-c8eb-a403a7e401fc@FreeBSD.org> In-Reply-To: <202101032029.103KTsw0028112@repo.freebsd.org> References: <202101032029.103KTsw0028112@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
This is a multi-part message in MIME format. --------------FE3EAB1EEA7002706B7D9A49 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Hi, I think the attached patch would be better for two reasons. First, because sed (REINPLACE_CMD) will fail silently if the referenced line is not found, applying a patch and then replacing it helps us know if the code gets refactored in a way that makes our REINPLACE_CMD ineffective (such as the line getting moved to a different file, for example). And second, because PREFIX should be used, since this is changing where files that are a part of this package are located. (LOCALBASE is where we find files installed by other packages.) Cheers, Steve On 1/3/21 3:29 PM, Sunpoet Po-Chuan Hsieh wrote: > Author: sunpoet > Date: Sun Jan 3 20:29:54 2021 > New Revision: 560241 > URL: https://svnweb.freebsd.org/changeset/ports/560241 > > Log: > Read inputrc from LOCALBASE/etc/inputrc rather than /etc/inputrc > > - Bump PORTREVISION for package change > > PR: 247933 > Reported by: Michael Osipov <michael.osipov@siemens.com> > > Modified: > head/devel/readline/Makefile > > Modified: head/devel/readline/Makefile > ============================================================================== > --- head/devel/readline/Makefile Sun Jan 3 20:29:49 2021 (r560240) > +++ head/devel/readline/Makefile Sun Jan 3 20:29:54 2021 (r560241) > @@ -3,6 +3,7 @@ > > PORTNAME= readline > PORTVERSION= 8.0.${PATCHLEVEL} > +PORTREVISION= 1 > CATEGORIES= devel > MASTER_SITES= GNU > DISTNAME= ${PORTNAME}-${PORTVERSION:R} > @@ -37,6 +38,7 @@ PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch > .endfor > > post-patch: > + @${REINPLACE_CMD} -e '/SYS_INPUTRC/ s|/etc/inputrc|${LOCALBASE}&|' ${WRKSRC}/rlconf.h > .if exists(/usr/lib/libtermcapw.so) > @${REINPLACE_CMD} 's|-ltermcap|-ltermcapw|g' ${WRKSRC}/configure > .endif > --------------FE3EAB1EEA7002706B7D9A49 Content-Type: text/x-patch; charset=UTF-8; name="readline_reinplace-rev0.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="readline_reinplace-rev0.diff" diff --git devel/readline/Makefile devel/readline/Makefile index 34820ecedc0d..36a5590c925e 100644 --- devel/readline/Makefile +++ devel/readline/Makefile @@ -38,7 +38,7 @@ PATCHFILES+= ${PORTNAME}${PORTVERSION:R:S|.||}-${patch:S|^|00|:S|.*(...)$|\1|} .endfor 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 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 --------------FE3EAB1EEA7002706B7D9A49--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?5d52f437-618a-0da2-c8eb-a403a7e401fc>