From nobody Thu Nov 11 11:20:05 2021 X-Original-To: ports-bugs@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 8AAD5185693E for ; Thu, 11 Nov 2021 11:20:05 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HqfQF3SB5z4trg for ; Thu, 11 Nov 2021 11:20:05 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org (kenobi.freebsd.org [IPv6:2610:1c1:1:606c::50:1d]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 48FE82FE8 for ; Thu, 11 Nov 2021 11:20:05 +0000 (UTC) (envelope-from bugzilla-noreply@freebsd.org) Received: from kenobi.freebsd.org ([127.0.1.5]) by kenobi.freebsd.org (8.15.2/8.15.2) with ESMTP id 1ABBK5pk052765 for ; Thu, 11 Nov 2021 11:20:05 GMT (envelope-from bugzilla-noreply@freebsd.org) Received: (from www@localhost) by kenobi.freebsd.org (8.15.2/8.15.2/Submit) id 1ABBK5xw052764 for ports-bugs@FreeBSD.org; Thu, 11 Nov 2021 11:20:05 GMT (envelope-from bugzilla-noreply@freebsd.org) X-Authentication-Warning: kenobi.freebsd.org: www set sender to bugzilla-noreply@freebsd.org using -f From: bugzilla-noreply@freebsd.org To: ports-bugs@FreeBSD.org Subject: [Bug 259772] Mk/Scripts/sed_checked.sh: Make it respect REINPLACE_ARGS Date: Thu, 11 Nov 2021 11:20:05 +0000 X-Bugzilla-Reason: CC X-Bugzilla-Type: changed X-Bugzilla-Watch-Reason: None X-Bugzilla-Product: Ports & Packages X-Bugzilla-Component: Ports Framework X-Bugzilla-Version: Latest X-Bugzilla-Keywords: X-Bugzilla-Severity: Affects Only Me X-Bugzilla-Who: yasu@freebsd.org X-Bugzilla-Status: New X-Bugzilla-Resolution: X-Bugzilla-Priority: --- X-Bugzilla-Assigned-To: portmgr@FreeBSD.org X-Bugzilla-Flags: X-Bugzilla-Changed-Fields: Message-ID: In-Reply-To: References: Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Bugzilla-URL: https://bugs.freebsd.org/bugzilla/ Auto-Submitted: auto-generated List-Id: Ports bug reports List-Archive: https://lists.freebsd.org/archives/freebsd-ports-bugs List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-freebsd-ports-bugs@freebsd.org X-BeenThere: freebsd-ports-bugs@freebsd.org MIME-Version: 1.0 X-ThisMailContainsUnwantedMimeParts: N https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=3D259772 --- Comment #2 from Yasuhiro Kimura --- (In reply to Mathieu Arnold from comment #1) I created attached patch to fix the issue I faced while I was handling the problem reported as bug #257017. To fix it I need to modified some lines of a original source file. So I add= ed following post-patch target to mail/rainloop/Makefile ---------------------------------------------------------------------- post-patch: ${REINPLACE_CMD} 's/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND =3D false/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND =3D true/' \ =20=20=20=20=20=20=20 ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php ---------------------------------------------------------------------- But it caused plist error because ${WRKSRC}/rainloop is copied to staging a= rea by using COPYTREE_SHARE at do-install target and backup file created at post-patch target is also copied. To fix it I added "REINPLACE_ARGS=3D-i ''" to Makefile to prevent backup fi= le from being created. It works as is expected with non-developer mode. But wi= th developer mode plist error still happens as sed_checked.sh creates backup f= ile. Since I put 'DEVELOPER=3Dyes' in make.conf of my system, it's a bit bothers= ome to comment it out each time I try to check plist with `make check-plist`. So I changed post-patch target as following. ---------------------------------------------------------------------- post-patch: ${REINPLACE_CMD} 's/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND =3D false/__USE_SINGLE_LINE_AUTH_PLAIN_COMMAND =3D true/' \ =20=20=20=20=20=20=20 ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.php ${RM} ${WRKSRC}/rainloop/v/${PORTVERSION}/app/libraries/MailSo/Smtp/SmtpClient.ph= p.bak ---------------------------------------------------------------------- By applying attached patch the behavior of sed_checked.sh changes as follow= ing. * If "REINPLACE_ARGS=3D-i ''" is specified it creates backup file with ".sed_checked" as extension, compares old and new file, and after that remo= ves backup file. * If REINPLACE_ARGS is set to other non-default value (e.g. "-i.backup"), it behaves just same as before except that specified value is used as extensio= n of backup file instead of ".bak". So it respects REINPLACE_ARGS and also do its job. And it makes `make check-plist` works fine with developer mode in my case. --=20 You are receiving this mail because: You are on the CC list for the bug.=