Date: Tue, 4 Feb 2025 16:10:50 +0000 From: Ryan Steinmetz <zi@freebsd.org> To: Alexey Dokuchaev <danfe@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 4ca613c4414b - main - irc/eggdrop: Fix build, bump PORTREVISION Message-ID: <Z6I8CkgG6byWvWyK@exodus.zi0r.com> In-Reply-To: <Z5sU2Ci8gC5Xm3HK@FreeBSD.org> References: <202501291814.50TIEUIr089656@gitrepo.freebsd.org> <Z5sU2Ci8gC5Xm3HK@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On (01/30/25 05:57), Alexey Dokuchaev wrote:
>On Wed, Jan 29, 2025 at 06:14:30PM +0000, Ryan Steinmetz wrote:
>> commit 4ca613c4414b2dfaa9de5336b6da5a74aa73f5d4
>>
>> irc/eggdrop: Fix build, bump PORTREVISION
>>
>> PR: 283584
>> ...
>> post-patch:
>> - @${REINPLACE_CMD} -e 's|tcl.h|tcl${TCL_VER}/tcl.h|g' ${WRKSRC}/src/mod/python.mod/pycmds.c
>> + @${SED} -i '' -e '25d' ${WRKSRC}/src/mod/python.mod/pycmds.c
>
>There are several issues with this commit. It doesn't explain what
>was the problem and how removing 25th line fixes it. Wasn't there
>a better anchor than the line number? Also, why use ${SED} -i ''
>instead of canonical ${REINPLACE_CMD}? Last, if it's a *build* fix,
>why bump port revision?
The submitter was following the exiting patterns (use of SED) in the port.
I've updated SED->REINPLACE_CMD and moved the line 25 deletion to a patch as I expect it will be replaced whenever upstream merges the open PR to address this.
Removing the line allows the --with-tclinc CONFIGURE_ARG and USES=tcl
magic to do their work.
Thanks,
-r
From the PR:
In file included from .././python.mod/python.c:46:
.././python.mod/pycmds.c:25:10: fatal error: 'tcl8.6/tcl.h' file not found
25 | #include <tcl8.6/tcl.h>
| ^~~~~~~~~~~~~~
1 error generated.
*** Error code 1
>
>./danfe
--
Ryan Steinmetz
PGP: 9079 51A3 34EF 0CD4 F228 EDC6 1EF8 BA6B D028 46D7
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Z6I8CkgG6byWvWyK>