From nobody Tue Feb 04 16:10:50 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YnSyk2KnZz5n2SC; Tue, 04 Feb 2025 16:10:54 +0000 (UTC) (envelope-from zi@freebsd.org) Received: from exodus2.zi0r.com (exodus2.zi0r.com [75.148.12.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "exodus.zi0r.com", Issuer "Gandi RSA Domain Validation Secure Server CA 3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YnSyj4vXwz3HCj; Tue, 04 Feb 2025 16:10:53 +0000 (UTC) (envelope-from zi@freebsd.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=softfail (mx1.freebsd.org: 75.148.12.42 is neither permitted nor denied by domain of zi@freebsd.org) smtp.mailfrom=zi@freebsd.org; dmarc=fail reason="No valid SPF, No valid DKIM" header.from=freebsd.org (policy=none) Received: from exodus.zi0r.com (syn.zi0r.com [71.179.14.194]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by exodus.zi0r.com (Postfix) with ESMTPSA id 1B1AA89281; Tue, 04 Feb 2025 11:10:52 -0500 (EST) Date: Tue, 4 Feb 2025 16:10:50 +0000 From: Ryan Steinmetz To: Alexey Dokuchaev 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: References: <202501291814.50TIEUIr089656@gitrepo.freebsd.org> List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii; format=flowed Content-Disposition: inline In-Reply-To: X-Spam-Score: -0.00 X-Spamd-Result: default: False [0.45 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_SPAM_LONG(1.00)[1.000]; NEURAL_SPAM_SHORT(0.25)[0.251]; ONCE_RECEIVED(0.20)[]; DMARC_POLICY_SOFTFAIL(0.10)[freebsd.org : No valid SPF, No valid DKIM,none]; MIME_GOOD(-0.10)[text/plain]; ARC_NA(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; MIME_TRACE(0.00)[0:+]; FREEFALL_USER(0.00)[zi]; TO_DN_SOME(0.00)[]; RCVD_COUNT_ONE(0.00)[1]; ASN(0.00)[asn:7922, ipnet:75.144.0.0/13, country:US]; RCVD_TLS_ALL(0.00)[]; R_DKIM_NA(0.00)[]; MLMMJ_DEST(0.00)[dev-commits-ports-all@freebsd.org,dev-commits-ports-main@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; FROM_HAS_DN(0.00)[]; MISSING_XM_UA(0.00)[]; RCVD_IN_DNSWL_NONE(0.00)[75.148.12.42:from]; TO_MATCH_ENVRCPT_SOME(0.00)[]; R_SPF_SOFTFAIL(0.00)[~all:c]; RCPT_COUNT_THREE(0.00)[4] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4YnSyj4vXwz3HCj 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 | ^~~~~~~~~~~~~~ 1 error generated. *** Error code 1 > >./danfe -- Ryan Steinmetz PGP: 9079 51A3 34EF 0CD4 F228 EDC6 1EF8 BA6B D028 46D7