svn commit: r560241 - head/devel/readline

[Steve Wills]

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 at 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
> 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: readline_reinplace-rev0.diff
Type: text/x-patch
Size: 1097 bytes
Desc: not available
URL: <http://lists.freebsd.org/pipermail/svn-ports-head/attachments/20210104/88cf2d18/attachment.bin>