Date: Tue, 29 Dec 2020 00:23:50 -0800 From: Chris <portmaster@bsdforge.com> To: freebsd-ports@freebsd.org Subject: Re: How to fix/patch hardcoded values Message-ID: <eef9ec4a89b5dc238f85c90d1d2199ee@bsdforge.com> In-Reply-To: <20201229080734.ibew4kwiejxihvob@aching.in.mat.cc> References: <CAFDf7ULqj2pzPb7WX-3oee_HHye3jnk93nV-XGbr1cjAcwgYqQ@mail.gmail.com> <20201229080734.ibew4kwiejxihvob@aching.in.mat.cc>
next in thread | previous in thread | raw e-mail | index | archive | help
On 2020-12-29 00:07, Mathieu Arnold wrote: > On Sun, Dec 27, 2020 at 09:58:13PM +0000, Nuno Teixeira wrote: >> Hello I've just submited a new port net/gitup >> <https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=252220>; and I used a >> simple workaround to help program find its config in /usr/local/etc instead >> of (hardcoded) ./ >> >> --- gitup.c.orig 2020-12-27 21:16:22 UTC >> +++ gitup.c >> @@ -2030,7 +2030,7 @@ main(int argc, char **argv) >> ... >> - const char *configuration_file = "./gitup.conf"; >> + const char *configuration_file = "/usr/local/etc/gitup.conf"; >> >> Now I'm thinking that this might not be the best fix in case PREFIX is a >> different one. >> >> Could I have an opinion on this? > > You need to change the patch to use %%PREFIX%% or %%LOCALBASE%% > depending on whether this is a reference to a path/file installed by the > software or by one of its dependency. Then, in a post-patch target, you > need to use REINPLACE_CMD to replace those to by they variables > equivalent, something like: > > post-patch: > ${REINPLACE_CMD} -e 's,%%PREFIX%%,${PREFIX}' ${WRKSRC}/githup.c It seems to me that you might also want to allow the user to reference a/their config from within their home dir (~/). But of course that's purely optional. Just thought I might mention it in case it mattered.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?eef9ec4a89b5dc238f85c90d1d2199ee>